diff options
| author | unknown <kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-11-10 02:36:29 +0100 |
|---|---|---|
| committer | unknown <kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-11-10 02:36:29 +0100 |
| commit | 65d25c75744bf40635eebb02e9672c0aa90779b6 (patch) | |
| tree | 4a88bbff4fd0ffc96753f449c2c9f9463b12cbee /mysql-test/mysql-test-run-shell.sh | |
| parent | 156d37a4af5f4baa8e34bbb5192ed9d955a16fed (diff) | |
| parent | bb662f6e626911bf712e204dcb368f264bf2cd8d (diff) | |
| download | mariadb-git-65d25c75744bf40635eebb02e9672c0aa90779b6.tar.gz | |
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
Diffstat (limited to 'mysql-test/mysql-test-run-shell.sh')
| -rw-r--r-- | mysql-test/mysql-test-run-shell.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run-shell.sh b/mysql-test/mysql-test-run-shell.sh index f2200c4be07..99c844b2f78 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -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 |