summaryrefslogtreecommitdiff
path: root/mysql-test/t/warnings.test
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-07-14 16:26:58 +0500
committerunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-07-14 16:26:58 +0500
commit39f9adfa849a9763dd883fd4661eb9ddfb47d576 (patch)
tree9741bdd736d6a09ae7e8bbcab977f7ebbc1efd73 /mysql-test/t/warnings.test
parent1787072458f518c68b940f17f54f2b5658f45469 (diff)
downloadmariadb-git-39f9adfa849a9763dd883fd4661eb9ddfb47d576.tar.gz
--{skip-}merge option added which allows the user to disable merge engine and
to avoid the potential security problem. (see bug #15195: Security Breach with MERGE table)
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 4bc8a338a35..aee03b39353 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -118,6 +118,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
#