diff options
author | monty@mysql.com <> | 2003-11-28 12:18:13 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2003-11-28 12:18:13 +0200 |
commit | ede8169d24c56a4e264034b3a098477072532ca5 (patch) | |
tree | e5a58d3f07e9cca109d78031822106ff2be7f6f8 /mysql-test | |
parent | 7733969bf65befdbf1fd4445ec6b7efa43b61492 (diff) | |
download | mariadb-git-ede8169d24c56a4e264034b3a098477072532ca5.tar.gz |
Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index f896f7fa9cc..29cd7a05f7d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # mysql-test-run - originally written by Matt Wagner <matt@mysql.com> # modified by Sasha Pachev <sasha@mysql.com> # Slightly updated by Monty @@ -229,7 +229,6 @@ while test $# -gt 0; do --local) USE_RUNNING_SERVER="" ;; --extern) USE_RUNNING_SERVER="1" ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; - --start-from=*) START_FROM=`$ECHO "$1" | $SED -e "s;--start-from=;;"` ;; --local-master) MASTER_MYPORT=3306; EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --host=127.0.0.1 \ @@ -1173,7 +1172,7 @@ run_testcase () slave_master_info_file=$TESTDIR/$tname.slave-mi echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` - if [ $USE_MANAGER = 1 ] ; then + if [ "$USE_MANAGER" = 1 ] ; then many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi @@ -1186,11 +1185,6 @@ run_testcase () fi fi - if [ "$tname" '<' "$START_FROM" ] ; then -# skip_test $tname; - return; - fi - if [ -n "$DO_TEST" ] ; then DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0` if [ x$DO_THIS_TEST = x0 ] ; |