summaryrefslogtreecommitdiff
path: root/mysql-test/t/init_file.test
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-04-02 13:00:44 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-04-02 13:00:44 +0200
commitedbfc0cb16b5906785e49b2826b9bcf37fd78f70 (patch)
tree424c32a823e5c662321101c02f681f2e77126fa1 /mysql-test/t/init_file.test
parentc3a43bcaa6eb7b252b83d8746504529c38361126 (diff)
downloadmariadb-git-edbfc0cb16b5906785e49b2826b9bcf37fd78f70.tar.gz
Bug #42507 mtr2: the --check is fooled up by a code executed in --init_file
mtr *thinks* there's a side effect Use the new force_restart() to avoid running the check-testcase
Diffstat (limited to 'mysql-test/t/init_file.test')
-rw-r--r--mysql-test/t/init_file.test9
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/t/init_file.test b/mysql-test/t/init_file.test
index ceb5cae9743..7eb5381651d 100644
--- a/mysql-test/t/init_file.test
+++ b/mysql-test/t/init_file.test
@@ -14,7 +14,7 @@ SELECT * INTO @X FROM init_file.startup limit 0,1;
SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y);
# Enable this DROP DATABASE only after resolving bug #42507
-# DROP DATABASE init_file;
+DROP DATABASE init_file;
--echo ok
--echo end of 4.1 tests
@@ -28,4 +28,9 @@ select * from t1;
# 30, 3, 11, 13
select * from t2;
# Enable this DROP TABLE only after resolving bug #42507
-#drop table t1, t2;
+drop table t1, t2;
+
+# MTR will restart server anyway, but by forcing it we avoid being warned
+# about the apparent side effect
+
+call mtr.force_restart();