diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
| commit | 945fa0d913a65c447306e945c44f50828903445b (patch) | |
| tree | 5178630451a60c8da965c19e0c339eb4f629de2f /mysql-test/t/init_file.test | |
| parent | 8526274c21ce0fd7eedac5275cb210cd2b048dc5 (diff) | |
| parent | 6a1bc662d67cdb7716480654ddd63d504508b4fa (diff) | |
| download | mariadb-git-945fa0d913a65c447306e945c44f50828903445b.tar.gz | |
Merge with mysql-maria tree
mysql-test/t/variables.test:
Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
Reset ha_open_options if one resets the delay_key_write variable.
Before there was no way to reset it without restarting mysqld, which caused some tests to fail
Diffstat (limited to 'mysql-test/t/init_file.test')
| -rw-r--r-- | mysql-test/t/init_file.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/init_file.test b/mysql-test/t/init_file.test index a6efbf6722e..ec74a5ff5ef 100644 --- a/mysql-test/t/init_file.test +++ b/mysql-test/t/init_file.test @@ -13,7 +13,8 @@ INSERT INTO init_file.startup VALUES ( NOW() ); 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); -DROP DATABASE init_file; +# Enable this DROP DATABASE only after resolving bug #42507 +# DROP DATABASE init_file; --echo ok --echo end of 4.1 tests @@ -26,4 +27,5 @@ select * from t1; # Expected: # 30, 3, 11, 13 select * from t2; -drop table t1, t2; +# Enable this DROP TABLE only after resolving bug #42507 +#drop table t1, t2; |