Преглед на файлове

Repair log rotation restart logic, and abstract mysqladmin flush-logs (do we really need this?) to stop section

Michael Schloh von Bennewitz преди 22 години
родител
ревизия
944b8aa975
променени са 2 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 1 1
      mysql/mysql.spec
  2. 6 6
      mysql/rc.mysql

+ 1 - 1
mysql/mysql.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [BASE]
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20030829
+Release:      20030904
 
 #   package options
 %option       with_berkeleydb  yes

+ 6 - 6
mysql/rc.mysql

@@ -55,6 +55,9 @@
 %stop -p 400 -u @l_rusr@
     rcService mysql enable yes || exit 0
     rcService mysql active no  && exit 0
+    @l_prefix@/bin/mysqladmin \
+        --defaults-extra-file=${mysql_pwd_file} \
+        flush-logs
     @l_prefix@/bin/mysqladmin \
         --defaults-extra-file=${mysql_pwd_file} \
         shutdown
@@ -74,22 +77,19 @@
         -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
         -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
         -P "${mysql_common_prolog}" \
-        -E "${mysql_common_epilog} && @l_prefix@/bin/mysqladmin \
-            --defaults-extra-file=${mysql_pwd_file} flush-logs" \
+        -E "${mysql_common_epilog} && echo 1 >$hintfile" \
         ${mysql_common_log}
     shtool rotate -f \
         -n ${mysql_update_numfiles} -s ${mysql_update_minsize} -d \
         -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
         -P "${mysql_update_prolog}" \
-        -E "${mysql_update_epilog} && @l_prefix@/bin/mysqladmin \
-            --defaults-extra-file=${mysql_pwd_file} flush-logs" \
+        -E "${mysql_update_epilog} && echo 1 >$hintfile" \
         ${mysql_update_log}
     shtool rotate -f \
         -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
         -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
         -P "${mysql_err_prolog}" \
-        -E "${mysql_err_epilog} && @l_prefix@/bin/mysqladmin \
-            --defaults-extra-file=${mysql_pwd_file} flush-logs" \
+        -E "${mysql_err_epilog} && echo 1 >$hintfile" \
         ${mysql_err_log}
     if [ -s $hintfile ]; then
         rc mysql restart