1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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

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


mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown
2006-11-10 02:28:31 +01:00

View File

@ -1750,10 +1750,13 @@ run_testcase ()
--result-file=*) --result-file=*)
result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"` result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
result_file="r/$result_file.result" result_file="r/$result_file.result"
# Note that this must be set to space, not "" for test-reset to # Note that this must be set to space, not "" for test-reset to work
# work
EXTRA_MASTER_OPT=" " EXTRA_MASTER_OPT=" "
;; ;;
--force-restart)
# Note that this must be set to space, not "" for test-reset to work
EXTRA_MASTER_OPT=" "
;;
esac esac
stop_master stop_master
stop_master 1 stop_master 1