- updated to 5.5.32

[packages/mysql.git] / mysql.init

diff --git a/mysql.init b/mysql.init
index b3a306eafd45323052c3a97cd7afe63cc7b05171..ab323549a136fd1178b1065d07c167f4b0b0e657 100755 (executable)
--- a/mysql.init
+++ b/mysql.init
@@ -359,7 +359,7 @@ mysqlstop() {
 # uses MYSQL_SOCKET - path to mysql socket
 slave_status() {
        # see if slave status can be reported
-       local err=0 slave_status=$(mysql -S $MYSQL_SOCKET -e 'show slave status\G')
+       local err=0 slave_status=$(mysql --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" -e 'show slave status\G')
        if [ -z "$slave_status" ]; then
                # slave not setup
                return
@@ -367,6 +367,7 @@ slave_status() {
 
        printf "Slave Status:\n"
 
+       set -f
        eval $(echo "$slave_status" | awk -F': ' '/^ *[A-Za-z_]+:/{
                k = tolower($1);
                v = substr($0, length($1) + 3);
@@ -374,8 +375,10 @@ slave_status() {
                gsub(/"/, "\\\"", v);
                gsub(/`/, "\\`", v);
                gsub(/\$/, "\\$", v);
+               gsub(/\$/, "\\$", v);
                printf("%s=\"%s\";\n", k, v);
        }')
+       set +f
 
        if [ "$slave_io_running" != "Yes" ]; then
                printf "\tSlave IO not running\n"
@@ -387,11 +390,11 @@ slave_status() {
        fi
 
        if [ "$err" = 1 -a "$last_errno" -gt 0 ]; then
-               printf "\tERROR $last_errno: $last_error\n"
+               printf "\tERROR %s: %s\n" "$last_errno" "$last_error"
        fi
 
        if [ "$master_log_file" != "$relay_master_log_file" ]; then
-               printf "\tERROR logfile mismatch ($relay_master_log_file)\n"
+               printf "\tERROR logfile mismatch (%s)\n" "$relay_master_log_file"
                err=1
        fi
 
@@ -402,9 +405,9 @@ slave_status() {
        fi
 
        diff=$(($read_master_log_pos - $exec_master_log_pos))
-       printf "\tread pos: $read_master_log_pos ($master_log_file) (host: $master_host:$master_port)\n"
-       printf "\texec pos: $exec_master_log_pos\n"
-       printf "\tdiff: $diff\n"
+       printf "\tread pos: %s (%s) (host: %s:%d)\n" "$read_master_log_pos" "$master_log_file" "$master_host" "$master_port"
+       printf "\texec pos: %s\n" "$exec_master_log_pos"
+       printf "\tdiff: %s\n" "$diff"
 }
 
 #
@@ -547,7 +550,11 @@ END_OF_MSG
        else
                fail
                cat << END_OF_MSG
-Installation of grant tables FAILED!
+ERROR:
+ERROR:
+ERROR: Installation of grant tables FAILED!
+ERROR:
+ERROR:
 
 The initialization SQL script was preserved at $MYSQL_DATA_DIR/mysql-init.sql
 
@@ -619,40 +626,8 @@ condrestart() {
        start
 }
 
-RETVAL=0
-case "$action" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  restart)
-       stop
-       start
-       ;;
-  try-restart)
-       condrestart 0
-       ;;
-  force-reload)
-       condrestart 7
-       ;;
-  init)
-       for mysqldir in $DB_CLUSTERS; do
-               mysqlinit "$mysqldir"
-       done
-       exit $?
-       ;;
-  flush-logs)
-       for mysqldir in $DB_CLUSTERS; do
-           mysqlgetconfig "$mysqldir"
-               # just if mysqld is really running
-               if /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
-                       /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
-               fi
-       done
-       ;;
-  status)
+status() {
+       local mysqldir addr port socket pid pids running datadir 
        RETVAL=3
        for mysqldir in $DB_CLUSTERS; do
                mysqlstatus "$mysqldir"
@@ -709,6 +684,43 @@ case "$action" in
                        echo
                done
        fi
+}
+
+RETVAL=0
+case "$action" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
+  init)
+       for mysqldir in $DB_CLUSTERS; do
+               mysqlinit "$mysqldir"
+       done
+       exit $?
+       ;;
+  flush-logs)
+       for mysqldir in $DB_CLUSTERS; do
+           mysqlgetconfig "$mysqldir"
+               # just if mysqld is really running
+               if /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
+                       /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
+               fi
+       done
+       ;;
+  status)
+       status
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|force-reload|init|flush-logs|status}"