summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <magnus@neptunus.(none)>2004-04-30 10:08:44 +0200
committerunknown <magnus@neptunus.(none)>2004-04-30 10:08:44 +0200
commit92d988402c993a3a7347204147c2c02180b9419d (patch)
tree2c847ea04fc897a6c7de6b529ee90e8bcf885b9b /mysql-test/mysql-test-run.sh
parent540c19bd4a74c279eba66325ac23df6f46821b1f (diff)
downloadmariadb-git-92d988402c993a3a7347204147c2c02180b9419d.tar.gz
Updated default NDB config to work better with sql-bench
Updated sql-bench configs to take NDB's limitations into account mysql-test/mysql-test-run.sh: Instruct run-all-tests to create tables in NDB if USE_NDBCLUSTER is set mysql-test/ndb/ndb_config_2_node.ini: Increase MaxNumberOfOperations to 100000 to support large deletes and inserts. sql-bench/server-cfg.sh: Add settings and limitations for NDB
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 36f11220862..fd992714f36 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1469,16 +1469,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