1 files changed, 37 insertions, 24 deletions
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result
index 261c7a7f197..c1c61cd7fe8 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -96,8 +96,8 @@ DROP TABLE IF EXISTS `t1`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t1` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -108,8 +108,8 @@ DROP TABLE IF EXISTS `t2`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t2` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -120,8 +120,8 @@ DROP TABLE IF EXISTS `t3`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t3` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -132,8 +132,8 @@ DROP TABLE IF EXISTS `t4`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t4` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -144,8 +144,8 @@ DROP TABLE IF EXISTS `t5`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t5` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -156,8 +156,8 @@ DROP TABLE IF EXISTS `t6`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t6` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -193,8 +193,8 @@ DROP TABLE IF EXISTS `t1`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t1` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -205,8 +205,8 @@ DROP TABLE IF EXISTS `t2`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t2` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -217,8 +217,8 @@ DROP TABLE IF EXISTS `t3`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t3` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -229,8 +229,8 @@ DROP TABLE IF EXISTS `t4`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t4` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -241,8 +241,8 @@ DROP TABLE IF EXISTS `t5`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t5` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -253,8 +253,8 @@ DROP TABLE IF EXISTS `t6`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `t6` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -277,3 +277,16 @@ drop table t3;
 drop table t4;
 drop table t5;
 drop table t6;
+SELECT @@global.storage_engine INTO @old_engine;
+SET GLOBAL storage_engine=InnoDB;
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES();
+SELECT COUNT(*) FROM v1;
+COUNT(*)
+1
+SELECT COUNT(*) FROM v1;
+COUNT(*)
+1
+DROP VIEW  v1;
+DROP TABLE t1;
+SET GLOBAL storage_engine=@old_engine;