diff options
| author | unknown <joerg@mysql.com> | 2006-04-06 18:42:07 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-04-06 18:42:07 +0200 |
| commit | ff85ba77be066607baac0dc16ee59e7174b9cb72 (patch) | |
| tree | 1d7bb619a22b9d9f469d65312065a41baa8ec53f /mysql-test/mysql-test-run.sh | |
| parent | e2b19a59d2e19cb30e6b71ac7a4fc8dc6e641130 (diff) | |
| download | mariadb-git-ff85ba77be066607baac0dc16ee59e7174b9cb72.tar.gz | |
Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored).
mysql-test/mysql-test-run.sh:
Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster"
and "--with-ndbcluster-only".
This is necessary because newer build tools will issue them, and the test
script should tolerate that.
Backport from 5.1 (Tomas Ulin, 2006-01-17)
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5853ffa201c..64eaaab9fa4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -230,6 +230,9 @@ FAILED_CASES= EXTRA_MASTER_OPT="" EXTRA_MYSQL_TEST_OPT="" USE_RUNNING_SERVER=1 +# backport from 5.1, disabled - this substitution is not done in 4.0 +# USE_NDBCLUSTER=@USE_NDBCLUSTER@ +# USE_NDBCLUSTER_ONLY=0 DO_GCOV="" DO_GDB="" MANUAL_GDB="" @@ -259,6 +262,14 @@ while test $# -gt 0; do SLAVE_MYSQLD=`$ECHO "$1" | $SED -e "s;--slave-binary=;;"` ;; --local) USE_RUNNING_SERVER="" ;; --extern) USE_RUNNING_SERVER="1" ;; + --with-ndbcluster) +# USE_NDBCLUSTER="--ndbcluster" ;; + $ECHO "Option '--with-ndbcluster' is ignored in this version" ;; + --with-ndbcluster-only) +# USE_NDBCLUSTER="--ndbcluster" +# USE_NDBCLUSTER_SLAVE="--ndbcluster" +# USE_NDBCLUSTER_ONLY=1 ;; + $ECHO "Option '--with-ndbcluster-only' is ignored in this version" ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --local-master) MASTER_MYPORT=3306; |