diff options
| author | unknown <joerg@mysql.com> | 2006-04-07 13:16:40 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-04-07 13:16:40 +0200 |
| commit | eb6b2bdc3e2d26003bdaa3b23ce92578d03e5032 (patch) | |
| tree | 11c67dfe64ea00bc9ffb9d4cc2d89e50fb2b6323 /mysql-test/mysql-test-run.sh | |
| parent | b3dad934787dbdc0aba7ea6ab4559eb0e2880e25 (diff) | |
| parent | 8fc0c48d5e929e7dcd38721a220d03c0f0979c74 (diff) | |
| download | mariadb-git-eb6b2bdc3e2d26003bdaa3b23ce92578d03e5032.tar.gz | |
Manual merge.
mysql-test/lib/mtr_process.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -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 7c5a810bf73..f5de3d1584b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT="" EXTRA_MYSQLBINLOG_OPT="" USE_RUNNING_SERVER=0 USE_NDBCLUSTER=@USE_NDBCLUSTER@ +USE_NDBCLUSTER_ONLY=0 USE_RUNNING_NDBCLUSTER="" USE_PURIFY="" PURIFY_LOGS="" @@ -341,6 +342,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=;;"` ;; @@ -1654,6 +1659,11 @@ run_testcase () result_file="r/$tname.result" echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0 \& \( $tname : federated \) = 0` + 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 |