- rel 4; don't try to fix symlinks that are correct now

[packages/mysql.git] / mysql.init

diff --git a/mysql.init b/mysql.init
index 2a1a01d961ebb99da1e97e874bcf9cb20c74700e..b4dd31442ec9eb8291b8b958711a8f3ebbca3eda 100755 (executable)
--- a/mysql.init
+++ b/mysql.init
@@ -455,7 +455,7 @@ mysqlinit() {
                nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/mysql"
                nls "before initializing database."
                nls "For now skipping cluster %s." "$clusterdir"
-               return
+               exit 6
        fi
 
        show "Installing MySQL system tables for $MYSQL_DATA_DIR"
@@ -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
 
@@ -623,6 +627,7 @@ condrestart() {
 }
 
 status() {
+       local mysqldir addr port socket pid pids running datadir 
        RETVAL=3
        for mysqldir in $DB_CLUSTERS; do
                mysqlstatus "$mysqldir"