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
This commit is contained in:
unknown 2006-11-10 02:36:29 +01:00
commit 65d25c7574

View file

@ -1815,10 +1815,13 @@ 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
stop_master
stop_master 1