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:
@ -1750,10 +1750,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
|
||||
|
Reference in New Issue
Block a user