summaryrefslogtreecommitdiff
path: root/mysql-test/main/merge.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/merge.result')
-rw-r--r--mysql-test/main/merge.result8
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/main/merge.result b/mysql-test/main/merge.result
index 7891ffa1723..075152da1c7 100644
--- a/mysql-test/main/merge.result
+++ b/mysql-test/main/merge.result
@@ -1,5 +1,6 @@
-set global storage_engine=myisam;
-set session storage_engine=myisam;
+set @save_default_storage_engine=@@global.storage_engine;
+set global default_storage_engine=myisam;
+set session default_storage_engine=myisam;
drop table if exists t1,t2,t3,t4,t5,t6;
drop database if exists mysqltest;
create table t1 (a int not null primary key auto_increment, message char(20));
@@ -2583,11 +2584,8 @@ prepare stmt from @a;
execute stmt;
prepare stmt from "select * from t_parent";
execute stmt;
-ERROR HY000: Prepared statement needs to be re-prepared
execute stmt;
-ERROR HY000: Prepared statement needs to be re-prepared
execute stmt;
-ERROR HY000: Prepared statement needs to be re-prepared
deallocate prepare stmt;
#
# Create merge parent