Commit edbfc0cb authored by Bjorn Munch's avatar Bjorn Munch

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
parent c3a43bca
...@@ -4,6 +4,7 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1; ...@@ -4,6 +4,7 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
YEAR(@X)-YEAR(@Y) YEAR(@X)-YEAR(@Y)
0 0
DROP DATABASE init_file;
ok ok
end of 4.1 tests end of 4.1 tests
select * from t1; select * from t1;
...@@ -19,3 +20,5 @@ y ...@@ -19,3 +20,5 @@ y
3 3
11 11
13 13
drop table t1, t2;
call mtr.force_restart();
...@@ -14,7 +14,7 @@ SELECT * INTO @X FROM init_file.startup limit 0,1; ...@@ -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 * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
# Enable this DROP DATABASE only after resolving bug #42507 # Enable this DROP DATABASE only after resolving bug #42507
# DROP DATABASE init_file; DROP DATABASE init_file;
--echo ok --echo ok
--echo end of 4.1 tests --echo end of 4.1 tests
...@@ -28,4 +28,9 @@ select * from t1; ...@@ -28,4 +28,9 @@ select * from t1;
# 30, 3, 11, 13 # 30, 3, 11, 13
select * from t2; select * from t2;
# Enable this DROP TABLE only after resolving bug #42507 # 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();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment