diff options
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index e49297dd06c..679a60ab8e1 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -2,6 +2,11 @@ # Test of MERGE TABLES # +# MERGE tables require MyISAM tables +let $default=`select @@global.storage_engine`; +set global storage_engine=myisam; +set session storage_engine=myisam; + --disable_warnings drop table if exists t1,t2,t3,t4,t5,t6; drop database if exists mysqltest; @@ -599,9 +604,9 @@ SELECT * FROM t3; DROP TABLE t1, t2, t3; - --echo End of 5.0 tests + # # Bug #8306: TRUNCATE leads to index corruption # @@ -738,7 +743,7 @@ DROP TABLE t1, t2; # *after* the administration task. It was terminated by UNLOCK TABLES only. # # This is the same test case as for -# Bug#26867 - LOCK TABLES + REPAIR + merge table result in memory/cpu hogging +# Bug#26867 - LOCK TABLES REPAIR + merge table result in memory/cpu hogging # # CREATE TABLE t1 (c1 INT) ENGINE= MyISAM; @@ -1381,3 +1386,8 @@ FLUSH TABLES m1, t1; UNLOCK TABLES; DROP TABLE t1, m1; +--disable_result_log +--disable_query_log +eval set global storage_engine=$default; +--enable_result_log +--enable_query_log |