X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql.init;h=59e41e7f46f3d52a5e91fa0bb14cfe69b8571053;hb=4a4ac33662ef479c1e69b0b83f5fe9e686d631cb;hp=ab323549a136fd1178b1065d07c167f4b0b0e657;hpb=bfeeb8ad08433b4da25106914f8cb1f1810bedf5;p=packages%2Fmysql.git

diff --git a/mysql.init b/mysql.init
index ab32354..59e41e7 100755
--- a/mysql.init
+++ b/mysql.init
@@ -292,7 +292,7 @@ mysqlstart() {
 			--datadir=$MYSQL_DATA_DIR \
 			--pid-file=$MYSQL_PIDFILE \
 			${MYSQL_LOG_ERROR:+--log-error="$MYSQL_LOG_ERROR"} \
-			$MYSQL_OPTIONS &
+			$MYSQL_OPTIONS 2>/dev/null &
 	pid=$!
 
 	sleep 0.1
@@ -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"
@@ -502,7 +502,7 @@ EOF
 		--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
+	[ -f $MYSQL_DATA_DIR/mysql/user.frm ] || ok=0
 
 	if [ "$ok" = 1 ]; then
 		rm -f $MYSQL_DATA_DIR/mysql-init.sql