SOURCES: mysql.init - give mysqld a chance to use preconfigured mysqld.conf...

[baggins]

Author: baggins                      Date: Tue Jan 13 12:38:44 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- give mysqld a chance to use preconfigured mysqld.conf in mysqlinit()

---- Files affected:
SOURCES:
   mysql.init (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.131 SOURCES/mysql.init:1.132
--- SOURCES/mysql.init:1.131	Mon Oct 27 14:57:07 2008
+++ SOURCES/mysql.init	Tue Jan 13 13:38:38 2009
@@ -400,9 +400,15 @@
 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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql.init?r1=1.131&r2=1.132&f=u