- rel 2; fix for SECURITY bug that allows any user to crash entire server

[packages/mysql.git] / mysql.init

diff --git a/mysql.init b/mysql.init
index f5cc30fea348d6dac77846d6547f13dca4e0d3e1..7cced78c9ccdcda90ac68611d81fd89aaf676971 100755 (executable)
--- a/mysql.init
+++ b/mysql.init
@@ -468,13 +468,13 @@ mysqlinit() {
        chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
        chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
 
-       if [ -f /usr/share/mysql/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
+       if [ -f /usr/share/percona-server/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
            sed -e "
                s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g;
                s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g;
                s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g;
                s#@clusterdir@#$MYSQL_CLUSTER_DIR#g;
-               " /usr/share/mysql/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
+               " /usr/share/percona-server/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
            chown root:root "$MYSQL_CLUSTER_DIR/mysqld.conf"
            chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
        fi
@@ -487,8 +487,8 @@ mysqlinit() {
        cat > $MYSQL_DATA_DIR/mysql-init.sql <<-EOF
                CREATE DATABASE mysql;
                use mysql;
-               $(cat /usr/share/mysql/mysql_system_tables.sql)
-               $(sed -e "/@current_hostname/d" /usr/share/mysql/mysql_system_tables_data.sql)
+               $(cat /usr/share/percona-server/mysql_system_tables.sql)
+               $(sed -e "/@current_hostname/d" /usr/share/percona-server/mysql_system_tables_data.sql)
 EOF
 
        ok=0
@@ -526,7 +526,7 @@ mysqladmin section. See the manual for more instructions.
 END_OF_MSG
                show "Filling help tables..."
                ok=0
-               ( echo "use mysql;"; cat /usr/share/mysql/fill_help_tables.sql ) | \
+               ( echo "use mysql;"; cat /usr/share/percona-server/fill_help_tables.sql ) | \
                        /usr/sbin/mysqld \
                        --defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
                        --bootstrap \
@@ -550,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
 
@@ -622,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"
@@ -712,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}"