From 46a3a81981a2ff88ba21103d9d3f0d2e95f5f882 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Tue, 7 Apr 2015 14:01:27 +0300
Subject: run_mysqld: switch to mysql_install_db

Use mysql_install_db for the installation
---
 tests/local-server/mysqld/bin    |  1 +
 tests/local-server/mysqld/my.cnf |  4 +---
 tests/local-server/mysqld/sbin   |  1 +
 tests/local-server/run_mysqld    | 34 +++++++++++++++++++---------------
 4 files changed, 22 insertions(+), 18 deletions(-)
 create mode 120000 tests/local-server/mysqld/bin
 create mode 120000 tests/local-server/mysqld/sbin

diff --git a/tests/local-server/mysqld/bin b/tests/local-server/mysqld/bin
new file mode 120000
index 0000000..0b11bef
--- /dev/null
+++ b/tests/local-server/mysqld/bin
@@ -0,0 +1 @@
+/usr/bin
\ No newline at end of file
diff --git a/tests/local-server/mysqld/my.cnf b/tests/local-server/mysqld/my.cnf
index 7aee042..cb9f5dc 100644
--- a/tests/local-server/mysqld/my.cnf
+++ b/tests/local-server/mysqld/my.cnf
@@ -1,5 +1,3 @@
-[client]
-socket = tests/local-server/mysqld/socket
-
 [mysqld]
 datadir = data
+socket = tests/local-server/mysqld/socket
diff --git a/tests/local-server/mysqld/sbin b/tests/local-server/mysqld/sbin
new file mode 120000
index 0000000..62015e5
--- /dev/null
+++ b/tests/local-server/mysqld/sbin
@@ -0,0 +1 @@
+/usr/sbin
\ No newline at end of file
diff --git a/tests/local-server/run_mysqld b/tests/local-server/run_mysqld
index 0ebe44b..c3c370e 100755
--- a/tests/local-server/run_mysqld
+++ b/tests/local-server/run_mysqld
@@ -13,7 +13,7 @@ ROOTPW=123456
 
 usage() {
 	me=`basename $0`
-	echo "$me: runs a local instance of apache (on port $PORT)"
+	echo "$me: runs a local instance of mysql (on port $PORT)"
 	echo "Usage: $me <start|stop|restart|reload|status> - the usual"
 	echo "Usage: $me <init|clean> - install / remove the databases"
 }
@@ -35,20 +35,23 @@ run_mysql_upgrade() {
 }
 
 init_mysql() {
-	set -x
-	(
-		echo "CREATE DATABASE mysql;"
-		#echo "GRANT ALL on *.* to 'root'@'localhost' identified by '$ROOTPW';"
-		echo "USE mysql;"
-		cat /usr/share/mysql/mysql_system_tables.sql
-		echo "UPDATE user SET password=PASSWORD("$ROOTPW") WHERE user='root';"
-		echo "FLUSH PRIVILEGES;"
-	) | run_mysqld --bootstrap
-	run_mysqld &
-	sleep 1
-	run_mysql_upgrade
-	"$0" stop
-	set +x
+	me=`id -un`
+	mysql_install_db \
+		--defaults-file=$MY_CNF \
+		--basedir="$ROOT" \
+		--datadir="$ROOT/data" \
+		--port=$PORT \
+		--socket=$ROOT/socket \
+		--user="$me"
+}
+
+run_client() {
+	mysql \
+		--defaults-file=$MY_CNF \
+		--port=$PORT \
+		--socket=$ROOT/socket \
+		--user="root" \
+		"$@"
 }
 
 case "$1" in
@@ -77,6 +80,7 @@ clean)
 	# TODO: stop? Check if we're alive?
 	rm -rf $ROOT/data/*
 	;;
+client) shift; run_client "$@";;
 *) usage; exit 1;;
 esac
 
-- 
cgit v1.2.3