Commit ff85ba77 authored by unknown's avatar unknown

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)
parent e2b19a59
...@@ -230,6 +230,9 @@ FAILED_CASES= ...@@ -230,6 +230,9 @@ FAILED_CASES=
EXTRA_MASTER_OPT="" EXTRA_MASTER_OPT=""
EXTRA_MYSQL_TEST_OPT="" EXTRA_MYSQL_TEST_OPT=""
USE_RUNNING_SERVER=1 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_GCOV=""
DO_GDB="" DO_GDB=""
MANUAL_GDB="" MANUAL_GDB=""
...@@ -259,6 +262,14 @@ while test $# -gt 0; do ...@@ -259,6 +262,14 @@ while test $# -gt 0; do
SLAVE_MYSQLD=`$ECHO "$1" | $SED -e "s;--slave-binary=;;"` ;; SLAVE_MYSQLD=`$ECHO "$1" | $SED -e "s;--slave-binary=;;"` ;;
--local) USE_RUNNING_SERVER="" ;; --local) USE_RUNNING_SERVER="" ;;
--extern) USE_RUNNING_SERVER="1" ;; --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=;;"` ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--local-master) --local-master)
MASTER_MYPORT=3306; MASTER_MYPORT=3306;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment