diff options
Diffstat (limited to 'tests/local-server/run_mysqld')
| -rwxr-xr-x | tests/local-server/run_mysqld | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/local-server/run_mysqld b/tests/local-server/run_mysqld index 5db9541..d705ca1 100755 --- a/tests/local-server/run_mysqld +++ b/tests/local-server/run_mysqld @@ -25,7 +25,7 @@ run_mysqld() { --pid-file=$PID_FILE \ --port=$PORT \ --socket=$ROOT/socket \ - "$@" & + "$@" } run_mysql_upgrade() { @@ -44,16 +44,15 @@ init_mysql() { echo "UPDATE user SET password=PASSWORD("$ROOTPW") WHERE user='root';" echo "FLUSH PRIVILEGES;" ) | run_mysqld --bootstrap - sleep 5 - run_mysqld - sleep 5 + run_mysqld & + sleep 1 run_mysql_upgrade "$0" stop set +x } case "$1" in -start) shift; run_mysqld "$@";; +start) shift; run_mysqld "$@" &;; init) init_mysql;; stop) kill `cat "$PID_FILE"`;; restart) |