summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
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/r/warnings.result
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/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 b9c05bc388c..69d33de75f4 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -171,6 +171,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