Commit 38026785 authored by serg@serg.mylan's avatar serg@serg.mylan

mysql-test-run: -start-from added, cleanup

parent 809f0406
...@@ -281,6 +281,7 @@ while test $# -gt 0; do ...@@ -281,6 +281,7 @@ while test $# -gt 0; do
--skip-rpl) NO_SLAVE=1 ;; --skip-rpl) NO_SLAVE=1 ;;
--skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;; --skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;;
--do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;; --do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;;
--start-from=* ) START_FROM=`$ECHO "$1" | $SED -e "s;--start-from=;;"` ;;
--warnings | --log-warnings) --warnings | --log-warnings)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --log-warnings" EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --log-warnings"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --log-warnings" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --log-warnings"
...@@ -1209,29 +1210,28 @@ run_testcase () ...@@ -1209,29 +1210,28 @@ run_testcase ()
if [ "$USE_MANAGER" = 1 ] ; then if [ "$USE_MANAGER" = 1 ] ; then
many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
fi fi
if $EXPR "$tname" '<' "$START_FROM" > /dev/null ; then
#skip_test $tname
return
fi
if [ -n "$SKIP_TEST" ] ; then if [ "$SKIP_TEST" ] ; then
SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0` if $EXPR \( "$tname" : "$SKIP_TEST" \) > /dev/null ; then
if [ x$SKIP_THIS_TEST = x1 ] ; skip_test $tname
then return
skip_test $tname;
return;
fi fi
fi fi
if [ -n "$DO_TEST" ] ; then if [ "$DO_TEST" ] ; then
DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0` if $EXPR \( "$tname" : "$DO_TEST" \) > /dev/null ; then
if [ x$DO_THIS_TEST = x0 ] ; else
then #skip_test $tname
skip_test $tname; return
return;
fi fi
fi fi
if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ; then
if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ; skip_test $tname
then
skip_test $tname;
return return
fi fi
......
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