1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

merge from 5.1-mtr

This commit is contained in:
Bjorn Munch
2009-05-25 22:58:31 +02:00
15 changed files with 401 additions and 188 deletions

View File

@ -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();