Commit 65d25c75 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


mysql-test/mysql-test-run-shell.sh:
  Auto merged
parents 156d37a4 bb662f6e

mysql-test/mysql-test-run-shell.sh

+5 −2
Original line number Diff line number Diff line
@@ -1815,8 +1815,11 @@ run_testcase () 
       --result-file=*)

         result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`

         result_file="r/$result_file.result"

         # Note that this must be set to space, not "" for test-reset to

# work

         # Note that this must be set to space, not "" for test-reset to work

	 EXTRA_MASTER_OPT=" "

         ;;

       --force-restart)

         # Note that this must be set to space, not "" for test-reset to work

	 EXTRA_MASTER_OPT=" "

	 ;;

     esac