diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/suite/maria/t/maria-recover.test | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/suite/maria/t/maria-recover.test')
| -rw-r--r-- | mysql-test/suite/maria/t/maria-recover.test | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test index 0fad13a297b..56259ad9a31 100644 --- a/mysql-test/suite/maria/t/maria-recover.test +++ b/mysql-test/suite/maria/t/maria-recover.test @@ -8,6 +8,10 @@ call mtr.add_suppression("Checking table: '\\..mysqltest.t_corrupted2'"); call mtr.add_suppression("Recovering table: '\\..mysqltest.t_corrupted2'"); call mtr.add_suppression("Table '\\..mysqltest.t_corrupted2' is marked as crashed and should be repaired"); +call mtr.add_suppression("Table 't_corrupted2' is marked as crashed and should be repaired"); + +let $def_checkinterval=`select @@global.aria_checkpoint_interval`; + --enable_query_log # Note: we're setting an environment variable (not prefixing it by $), @@ -34,6 +38,10 @@ insert into t1 values("ThursdayMorningsMarket"); flush table t1; # put index page on disk insert into t1 select concat(a,'b') from t1 limit 1; +# force a checkpoint to get the open count > 0 +set global aria_checkpoint_interval=1000; +# Wait for checkpoint to happen +--sleep 1 # now t1 has its open_count>0 and so will t2_corrupted. # It is not named t2 because the corruption messages which will be put # in the error log need to be detected in mtr_process.pl, and we want @@ -57,7 +65,6 @@ perl; syswrite (FILE, $whatever) or die; close FILE; EOF - replace_regex /Table.*t_corrupted2/t_corrupted2/ ; --enable_prepare_warnings select * from t_corrupted2; # should show corruption and repair messages @@ -66,3 +73,4 @@ select * from t_corrupted2; # should show just rows drop database mysqltest; set global aria_recover=backup; +eval set global aria_checkpoint_interval=$def_checkinterval; |