1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/main/enforce_storage_engine_opt.result b/mysql-test/main/enforce_storage_engine_opt.result
new file mode 100644
index 00000000000..1b03aa281d9
--- /dev/null
+++ b/mysql-test/main/enforce_storage_engine_opt.result
@@ -0,0 +1,15 @@
+SET SQL_MODE="";
+create table t1 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
+Warnings:
+Note	1266	Using storage engine MyISAM for table 't1'
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL AUTO_INCREMENT,
+  `c2` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+set session sql_mode='no_engine_substitution';
+create table t2 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
+ERROR 42000: Unknown storage engine 'MEMORY'
+drop table t1;