Commit 6d7937c0 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/M40/mysql-4.0
parents 8722bb9a 1b17ba52

mysql-test/mysql-test-run.sh

+11 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
# Sligtly updated by Monty

# Cleaned up again by Matt

# Fixed by Sergei

# List of failed cases (--force) backported from 4.1 by Joerg

# :-)



#++
@@ -202,6 +203,7 @@ MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log 
MYSQL_MANAGER_USER=root

NO_SLAVE=0

USER_TEST=

FAILED_CASES=



EXTRA_MASTER_OPT=""

EXTRA_MYSQL_TEST_OPT=""
@@ -1333,7 +1335,7 @@ run_testcase () 
	show_failed_diff $result_file

	$ECHO

	if [ x$FORCE != x1 ] ; then

	 $ECHO "Aborting. To continue, re-run with '--force'."

	 $ECHO "Aborting: $tname failed. To continue, re-run with '--force'."

	 $ECHO

         if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]

	 then
@@ -1342,7 +1344,7 @@ run_testcase () 
   	 fi

	 exit 1

	fi



	FAILED_CASES="$FAILED_CASES $tname"

        if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]

	then

	  mysql_restart
@@ -1485,4 +1487,10 @@ $ECHO 
[ "$DO_GCOV" ] && gcov_collect # collect coverage information

[ "$DO_GPROF" ] && gprof_collect # collect coverage information



if [ $TOT_FAIL -ne 0 ]; then

  $ECHO "mysql-test-run: *** Failing the test(s):$FAILED_CASES"

  $ECHO

  exit 1

else

  exit 0

fi