Commit 8f728762 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

mysql-test-run.sh --skip-rpl for skip replication tests added

parent 3669828a
...@@ -6,3 +6,4 @@ sasha@mysql.sashanet.com ...@@ -6,3 +6,4 @@ sasha@mysql.sashanet.com
sasha@work.mysql.com sasha@work.mysql.com
tim@cane.mysql.fi tim@cane.mysql.fi
tim@work.mysql.com tim@work.mysql.com
serg@serg.mysql.com
...@@ -92,6 +92,7 @@ MASTER_RUNNING=0 ...@@ -92,6 +92,7 @@ MASTER_RUNNING=0
MASTER_MYPORT=9306 MASTER_MYPORT=9306
SLAVE_RUNNING=0 SLAVE_RUNNING=0
SLAVE_MYPORT=9307 SLAVE_MYPORT=9307
NO_SLAVE=0
EXTRA_MYSQL_TEST_OPT="" EXTRA_MYSQL_TEST_OPT=""
USE_RUNNING_SERVER=1 USE_RUNNING_SERVER=1
...@@ -107,6 +108,7 @@ while test $# -gt 0; do ...@@ -107,6 +108,7 @@ while test $# -gt 0; do
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;; --master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;;
--slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;; --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;;
--skip-rpl) NO_SLAVE=1 ;;
--record) --record)
RECORD=1; RECORD=1;
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;;
...@@ -481,6 +483,19 @@ run_testcase () ...@@ -481,6 +483,19 @@ run_testcase ()
slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ;
then
USERT=" ...."
SYST=" ...."
REALT=" ...."
timestr="$USERT $SYST $REALT"
pname=`$ECHO "$tname "|$CUT -c 1-16`
RES="$pname $timestr"
pass_inc
$ECHO "$RES$RES_SPACE [ skipped ]"
return
fi
if [ -f $master_opt_file ] ; if [ -f $master_opt_file ] ;
then then
EXTRA_MASTER_OPT=`$CAT $master_opt_file` EXTRA_MASTER_OPT=`$CAT $master_opt_file`
......
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