database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into neptunus.(none):/home/magnus/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown
2004-05-05 08:55:32 +02:00
parent af847c22af 316c128f9d
commit 444fc86258
15 changed files with 2344 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.sh
View File

@ -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