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

diff --git a/mysql.init b/mysql.init
index ab32354..fb8bd1b 100755
--- 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"
@@ -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