- give mysqld a chance to use preconfigured mysqld.conf in mysqlinit()

Changed files:
    mysql.init -> 1.132

diff --git a/mysql.init b/mysql.init
index ebfad620a250d5934fb36811ec92fa26abc8e6bd..22a1a71509ff7efc22e4e5b8ffdc558b7c9a1e3b 100644 (file)
--- a/mysql.init
+++ b/mysql.init
@@ -400,9 +400,15 @@ mysqlinit() {
 EOF
 
        ok=0
-       /usr/sbin/mysqld --bootstrap --skip-grant-tables \
-               --datadir=$MYSQL_DATA_DIR --user=$MYSQL_USER \
-               --slave-load-tmpdir=$MYSQL_DATA_DIR --tmpdir=$MYSQL_DATA_DIR --log-error=$MYSQL_ERRLOG \
+       /usr/sbin/mysqld \
+               --defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
+               --bootstrap \
+               --skip-grant-tables \
+               --datadir=$MYSQL_DATA_DIR \
+               --user=$MYSQL_USER \
+               --slave-load-tmpdir=$MYSQL_DATA_DIR \
+               --tmpdir=$MYSQL_DATA_DIR \
+               --log-error=$MYSQL_ERRLOG \
                < $MYSQL_DATA_DIR/mysql-init.sql && ok=1
        [ -f $MYSQL_DATA_DIR/mysql/host.frm ] || ok=0