summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
authortsmith/tim@siva.hindu.god <>2006-07-20 00:45:47 -0600
committertsmith/tim@siva.hindu.god <>2006-07-20 00:45:47 -0600
commit17cc8acc919132ed7ec41875f305892dd04ee8d7 (patch)
treedc9268fb50bb5827fea970fbaeedc639ede55a18 /mysql-test/r/warnings.result
parent36bf00709ea0c85bc322c5f2ae47003ade4de714 (diff)
parent0d15e5e340bdabdb3df9aae42d2d2579d09edf66 (diff)
downloadmariadb-git-17cc8acc919132ed7ec41875f305892dd04ee8d7.tar.gz
Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed
Diffstat (limited to 'mysql-test/r/warnings.result')
-rw-r--r--mysql-test/r/warnings.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index f9006ebca37..59be512d5a6 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -173,6 +173,13 @@ alter table t1 engine=isam;
Warnings:
Warning 1266 Using storage engine MyISAM for table 't1'
drop table t1;
+create table t1 (id int) engine=merge;
+Warnings:
+Warning 1266 Using storage engine MyISAM for table 't1'
+alter table t1 engine=merge;
+Warnings:
+Warning 1266 Using storage engine MyISAM for table 't1'
+drop table t1;
create table t1 (id int) type=heap;
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead