summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh11
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