summaryrefslogtreecommitdiff
path: root/mysql-test/t/warnings.test
diff options
context:
space:
mode:
authorunknown <tsmith/tim@siva.hindu.god>2006-07-20 00:45:47 -0600
committerunknown <tsmith/tim@siva.hindu.god>2006-07-20 00:45:47 -0600
commitd7baef2a65848c0466630a5a8e54d6bc69320f25 (patch)
treedc9268fb50bb5827fea970fbaeedc639ede55a18 /mysql-test/t/warnings.test
parent8a08c8023534b9651b72d9528f06960feb7bfa3c (diff)
parente7ea49dc0d6d4e958cf2a515edcf0fdfc99b8199 (diff)
downloadmariadb-git-d7baef2a65848c0466630a5a8e54d6bc69320f25.tar.gz
Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed
Diffstat (limited to 'mysql-test/t/warnings.test')
-rw-r--r--mysql-test/t/warnings.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test
index 71e847d1d8c..4768c7574e5 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -117,6 +117,10 @@ create table t1 (id int) engine=isam;
alter table t1 engine=isam;
drop table t1;
+create table t1 (id int) engine=merge;
+alter table t1 engine=merge;
+drop table t1;
+
#
# Test for deprecated TYPE= syntax
#