Author: glen Date: Mon Oct 27 13:57:12 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use same error log for init procedure
---- Files affected:
SOURCES:
mysql.init (1.130 -> 1.131)
---- Diffs:
================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.130 SOURCES/mysql.init:1.131
--- SOURCES/mysql.init:1.130 Mon Oct 27 12:38:36 2008
+++ SOURCES/mysql.init Mon Oct 27 14:57:07 2008
@@ -402,8 +402,8 @@
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 < \
- $MYSQL_DATA_DIR/mysql-init.sql 2>> /var/log/mysql/err && ok=1
+ --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
if [ "$ok" = 1 ]; then
@@ -431,8 +431,8 @@
( echo "use mysql;"; cat /usr/share/mysql/fill_help_tables.sql
) | \
/usr/sbin/mysqld --bootstrap --skip-grant-tables \
--datadir=$MYSQL_DATA_DIR --user=$MYSQL_USER \
- --slave-load-tmpdir=$MYSQL_DATA_DIR
--tmpdir=$MYSQL_DATA_DIR \
- 2>> /var/log/mysql/err && ok=1
+ --slave-load-tmpdir=$MYSQL_DATA_DIR
--tmpdir=$MYSQL_DATA_DIR --log-error=$MYSQL_ERRLOG \
+ && ok=1
if [ "$ok" = 1 ]; then
ok
else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql.init?r1=1.130&r2=1.131&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
