diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result index 24900fab56a..5e3030f2c7a 100644 --- a/mysql-test/r/rpl_temporary.result +++ b/mysql-test/r/rpl_temporary.result @@ -24,9 +24,9 @@ drop table if exists t1,t2; create table t1(f int); create table t2(f int); insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); insert into t3 select * from t1 where f<6; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); insert into t2 select count(*) from t3; insert into t3 select * from t1 where f>=4; drop temporary table t3; @@ -46,13 +46,13 @@ SET TIMESTAMP=1040323938; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); SET TIMESTAMP=1040323945; SET @@session.pseudo_thread_id=1; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); SET TIMESTAMP=1040323952; SET @@session.pseudo_thread_id=1; insert into t3 select * from t1 where f<6; SET TIMESTAMP=1040324145; SET @@session.pseudo_thread_id=2; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); SET TIMESTAMP=1040324186; SET @@session.pseudo_thread_id=1; insert into t2 select count(*) from t3; @@ -73,4 +73,4 @@ f 5 7 drop table t1,t2; -create temporary table t3 (f int)ENGINE=MyISAM; +create temporary table t3 (f int); diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test index 3cd2357e565..9c6056f9217 100644 --- a/mysql-test/t/rpl_temporary.test +++ b/mysql-test/t/rpl_temporary.test @@ -1,7 +1,3 @@ -######################################################### -# 2006-02-07 By JBM according to 16552 MyISAM should be used -# As work around for NDB using temp tables. -########################################################## -- source include/master-slave.inc @@ -60,12 +56,12 @@ create table t2(f int); insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); connection con1; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); insert into t3 select * from t1 where f<6; sleep 1; connection con2; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); sleep 1; connection con1; @@ -103,13 +99,13 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); SET TIMESTAMP=1040323945; SET @@session.pseudo_thread_id=1; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); SET TIMESTAMP=1040323952; SET @@session.pseudo_thread_id=1; insert into t3 select * from t1 where f<6; SET TIMESTAMP=1040324145; SET @@session.pseudo_thread_id=2; -create temporary table t3(f int)ENGINE=MyISAM; +create temporary table t3(f int); SET TIMESTAMP=1040324186; SET @@session.pseudo_thread_id=1; insert into t2 select count(*) from t3; @@ -132,7 +128,7 @@ drop table t1,t2; # Create last a temporary table that is not dropped at end to ensure that we # don't get any memory leaks for this -create temporary table t3 (f int)ENGINE=MyISAM; +create temporary table t3 (f int); sync_with_master; # The server will now close done