diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-28 23:40:20 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-28 23:40:20 +0000 |
| commit | edc0bbc56ea9e4716ac352b93ef71f2865e089da (patch) | |
| tree | 02e64a39120557b154db89b15fa735302b1c7cac /mysql-test/mysql-test-run.sh | |
| parent | 1dd9333fb150c19dfec4fe306a763ae60d63acae (diff) | |
| download | mariadb-git-edc0bbc56ea9e4716ac352b93ef71f2865e089da.tar.gz | |
multiple servers for cluster
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8ee15c148e3..3c04fa6eb66 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -254,9 +254,9 @@ while test $# -gt 0; do --extern) USE_RUNNING_SERVER="1" ;; --with-ndbcluster) USE_NDBCLUSTER="--ndbcluster" ;; - --ndbconnectstring=*) + --ndb-connectstring=*) USE_NDBCLUSTER="--ndbcluster" ; - USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndbconnectstring=;;"` ;; + USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --local-master) MASTER_MYPORT=3306; @@ -1038,7 +1038,7 @@ EOF -title "Master" -e gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD fi else - manager_launch master$1 $MASTER_MYSQLD $master_args + manager_launch master $MASTER_MYSQLD $master_args fi sleep_until_file_created $MASTER_MYPID$1 $wait_for_master wait_for_master=$SLEEP_TIME_FOR_SECOND_MASTER @@ -1225,7 +1225,7 @@ stop_master () # MASTER_RUNNING=0 to get cleanup when calling start_master(). if [ x$USE_EMBEDDED_SERVER != x1 ] ; then pid=`$CAT $MASTER_MYPID$1` - manager_term $pid master + manager_term $pid master $1 if [ $? != 0 ] && [ -f $MASTER_MYPID$1 ] then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" @@ -1386,7 +1386,7 @@ run_testcase () stop_master 1 echo "CURRENT_TEST: $tname" >> $MASTER_MYERR start_master - if [ ! -z "$USE_NDBCLUSTER" ] ; then + if [ -n "$USE_NDBCLUSTER" -a -z "$DO_BENCH" ] ; then start_master 1 fi TZ=$MY_TZ; export TZ @@ -1402,7 +1402,7 @@ run_testcase () stop_master 1 echo "CURRENT_TEST: $tname" >> $MASTER_MYERR start_master - if [ ! -z "$USE_NDBCLUSTER" ] ; then + if [ -n "$USE_NDBCLUSTER" -a -z "$DO_BENCH" ] ; then start_master 1 fi else |