diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-03-01 19:36:46 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-03-01 19:36:46 -0700 |
| commit | 2c9879ca0cfd319e939835816cd4501b1d097b0a (patch) | |
| tree | dd5cbc9c1cf52f454bd88e24e1401696ae7da26c /mysql-test/mysql-test-run.sh | |
| parent | 80d375b1566da63bbfcaed6d4ab339ae4add5b04 (diff) | |
| parent | 1dd4cf0295fcc176ff4ea314afb4ceb8910792ce (diff) | |
| download | mariadb-git-2c9879ca0cfd319e939835816cd4501b1d097b0a.tar.gz | |
merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing.
Let's hope this did not break anything. Will not push this one until Monty
gets back
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
strings/Makefile.am:
Auto merged
client/mysql.cc:
merged from 3.23
configure.in:
merged from 3.23
mysql-test/mysql-test-run.sh:
merged from 3.23
sql/mysqld.cc:
merged from 3.23
support-files/mysql.spec.sh:
merged from 3.23
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 465c1cfdaa2..34b0caf55ca 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -161,11 +161,8 @@ MASTER_RUNNING=0 MASTER_MYPORT=9306 SLAVE_RUNNING=0 SLAVE_MYPORT=9307 -MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves -MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd -MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log -MYSQL_MANAGER_USER=root NO_SLAVE=0 +USER_TEST= EXTRA_MASTER_OPT="" EXTRA_MYSQL_TEST_OPT="" @@ -250,6 +247,9 @@ while test $# -gt 0; do EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" SLEEP_TIME_AFTER_RESTART=`$ECHO "$1" | $SED -e "s;--sleep=;;"` ;; + --user-test=*) + USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"` + ;; --mysqld=*) TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"` EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP" |