diff options
Diffstat (limited to 'tests/local-server/run_mysqld')
| -rwxr-xr-x | tests/local-server/run_mysqld | 34 |
1 files changed, 19 insertions, 15 deletions
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 |