diff options
| author | unknown <joerg@mysql.com> | 2006-04-07 12:22:55 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-04-07 12:22:55 +0200 |
| commit | 6206e7c2283aefd02b06e0250b17db92838212d2 (patch) | |
| tree | f5163aa1203a01930cbf9cf82845148e49b0d4f2 /mysql-test | |
| parent | 00cfd1a75f97eefcd9bfd64c63ee84cd33c2f648 (diff) | |
| parent | ff85ba77be066607baac0dc16ee59e7174b9cb72 (diff) | |
| download | mariadb-git-6206e7c2283aefd02b06e0250b17db92838212d2.tar.gz | |
mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1)
mysql-test/mysql-test-run.sh:
Manual merge from 4.0 (which was a 5.1 backport):
"--with-ndbcluster" is already present,
"--with-ndbcluster-only" is really usable here.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index dac64e05c20..8ccd6770995 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -243,6 +243,7 @@ EXTRA_MYSQLDUMP_OPT="" EXTRA_MYSQLBINLOG_OPT="" USE_RUNNING_SERVER="" USE_NDBCLUSTER=@USE_NDBCLUSTER@ +USE_NDBCLUSTER_ONLY=0 USE_RUNNING_NDBCLUSTER="" USE_PURIFY="" PURIFY_LOGS="" @@ -295,6 +296,10 @@ while test $# -gt 0; do --extern) USE_RUNNING_SERVER="1" ;; --with-ndbcluster) USE_NDBCLUSTER="--ndbcluster" ;; + --with-ndbcluster-only) + USE_NDBCLUSTER="--ndbcluster" + USE_NDBCLUSTER_SLAVE="--ndbcluster" + USE_NDBCLUSTER_ONLY=1 ;; --ndb-connectstring=*) USE_NDBCLUSTER="--ndbcluster" ; USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;; @@ -1524,6 +1529,11 @@ run_testcase () disable_test $tname "$comment" return fi + NDBCLUSTER_TEST=`$EXPR \( $tname : '.*ndb.*' \) != 0` + if [ "x$USE_NDBCLUSTER_ONLY" = "x1" -a "x$NDBCLUSTER_TEST" != "x1" ] ; then + skip_test $tname + return + fi if [ "$USE_MANAGER" = 1 ] ; then many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi |