diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-04-02 13:00:44 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-04-02 13:00:44 +0200 |
| commit | 6494ae0357a10ef484868450ca0cb33166f9684d (patch) | |
| tree | 424c32a823e5c662321101c02f681f2e77126fa1 | |
| parent | 0fcfab24d70a17c1194a7c5c54de89a706fbb4f8 (diff) | |
| download | mariadb-git-6494ae0357a10ef484868450ca0cb33166f9684d.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
| -rw-r--r-- | mysql-test/r/init_file.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/init_file.test | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/r/init_file.result b/mysql-test/r/init_file.result index 8e014815a9c..43ed908ad01 100644 --- a/mysql-test/r/init_file.result +++ b/mysql-test/r/init_file.result @@ -4,6 +4,7 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1; SELECT YEAR(@X)-YEAR(@Y); YEAR(@X)-YEAR(@Y) 0 +DROP DATABASE init_file; ok end of 4.1 tests select * from t1; @@ -19,3 +20,5 @@ y 3 11 13 +drop table t1, t2; +call mtr.force_restart(); 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(); |