diff options
| author | magnus@neptunus.(none) <> | 2004-05-05 08:55:32 +0200 |
|---|---|---|
| committer | magnus@neptunus.(none) <> | 2004-05-05 08:55:32 +0200 |
| commit | 347dfcd879c6a969d62b2aeb1e8e3c4ac71392cb (patch) | |
| tree | adf56398acf76b8fec9afaf97a1b5f4372e1f3e5 /mysql-test/mysql-test-run.sh | |
| parent | ee627d251062c455ccd57dac28497d896c721a0e (diff) | |
| parent | 89c231ccfa6a26d41df6f249684a8536d6221e2a (diff) | |
| download | mariadb-git-347dfcd879c6a969d62b2aeb1e8e3c4ac71392cb.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 2d189d1b10b..8d675ec7f68 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1470,16 +1470,23 @@ $ECHO "Starting Tests" # if [ "$DO_BENCH" = 1 ] then + start_master + + if [ ! -z "$USE_NDBCLUSTER" ] + then + EXTRA_BENCH_ARGS="--create-options=TYPE=ndb" + fi + BENCHDIR=$BASEDIR/sql-bench/ savedir=`pwd` cd $BENCHDIR if [ -z "$1" ] then - ./run-all-tests --socket=$MASTER_MYSOCK --user=root + ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS else if [ -x "./$1" ] then - ./$1 --socket=$MASTER_MYSOCK --user=root + ./$1 --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS else echo "benchmark $1 not found" fi |