diff options
| author | jimw@mysql.com <> | 2005-04-27 17:50:48 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-04-27 17:50:48 -0700 |
| commit | 518f64420403cb67637c635ca025920d2b0bc23c (patch) | |
| tree | ff637081223989b0e605d9086e8c68057a7f0114 /mysql-test/mysql-test-run.sh | |
| parent | 699c35c80eb0a31983bf09d1515a69456b589da7 (diff) | |
| download | mariadb-git-518f64420403cb67637c635ca025920d2b0bc23c.tar.gz | |
Fix 'mysql_client_test' with embedded server. (Bug #9634)
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8522ac5d955..bdbd46ae8dd 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -685,6 +685,12 @@ then fi MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent $EXTRA_MYSQL_CLIENT_TEST_OPT" +# Need to pass additional arguments to MYSQL_CLIENT_TEST for embedded server +# -A marks each argument for passing to the function which initializes the +# embedded library +if [ "x$USE_EMBEDDED_SERVER" = "x1" ]; then + MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST -A --language=$LANGUAGE -A --datadir=$SLAVE_MYDDIR -A --character-sets-dir=$CHARSETSDIR" +fi MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT" MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose" |