summaryrefslogtreecommitdiff
path: root/mysql-test/t/query_cache.test
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot4.local>2007-08-08 17:56:15 +0200
committerunknown <guilhem@gbichot4.local>2007-08-08 17:56:15 +0200
commitc7f9cf127c74c3ffb80632ffe3d0f13c8ea695dc (patch)
treecf56c7b09e781c41907c0abdec7a361d99dfcc7d /mysql-test/t/query_cache.test
parent711a820133c1143131ac2ae179c60570aa45f360 (diff)
downloadmariadb-git-c7f9cf127c74c3ffb80632ffe3d0f13c8ea695dc.tar.gz
Tests which use INSERT DELAYED or MERGE tables should explicitely
specify that they want a MyISAM table, otherwise they fail when run with --default-storage-engine=maria. mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: uses INSERT DELAYED so has to specify MyISAM mysql-test/extra/rpl_tests/rpl_insert_delayed.test: uses INSERT DELAYED so has to specify MyISAM mysql-test/r/query_cache.result: result update mysql-test/r/rpl_insert.result: result update mysql-test/r/rpl_stm_flsh_tbls.result: result update mysql-test/r/rpl_stm_insert_delayed.result: result update mysql-test/r/rpl_switch_stm_row_mixed.result: result update mysql-test/r/subselect.result: result update mysql-test/t/query_cache.test: uses MERGE so has to specify MyISAM mysql-test/t/query_cache_merge.test: uses MERGE so has to specify MyISAM mysql-test/t/rpl_insert.test: uses INSERT DELAYED so has to specify MyISAM mysql-test/t/rpl_stm_flsh_tbls.test: specifying the engine lengthens the query in binlog so shifts positions mysql-test/t/rpl_switch_stm_row_mixed.test: uses INSERT DELAYED so has to specify MyISAM mysql-test/t/subselect.test: uses INSERT DELAYED so has to specify MyISAM
Diffstat (limited to 'mysql-test/t/query_cache.test')
-rw-r--r--mysql-test/t/query_cache.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 14ccea0fdc8..400153551ba 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -45,9 +45,9 @@ show status like "Qcache_queries_in_cache";
#
# MERGE TABLES with INSERT/UPDATE and DELETE
#
-create table t1 (a int not null);
+create table t1 (a int not null) ENGINE=MyISAM;
insert into t1 values (1),(2),(3);
-create table t2 (a int not null);
+create table t2 (a int not null) ENGINE=MyISAM;
insert into t2 values (4),(5),(6);
create table t3 (a int not null) engine=MERGE UNION=(t1,t2) INSERT_METHOD=FIRST;
# insert
@@ -294,7 +294,7 @@ drop table t1;
flush query cache;
reset query cache;
-create table t1 (a int not null);
+create table t1 (a int not null) ENGINE=MyISAM;
insert into t1 values (1),(2),(3);
select * from t1;
select * from t1;