1 files changed, 117 insertions, 63 deletions

diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result
index a84cace35fe..cb0726cd623 100644
--- a/mysql-test/suite/jp/r/jp_enum_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `｣ﾔ｣ｶ`;
 drop table if exists `｣ﾔ｣ｷ`;
 drop table if exists `｣ﾔ｣ｸ`;
 drop table if exists `｣ﾔ｣ｹ`;
-drop table if exists `｣ﾔ｣ｱ｣ｰ`;
-drop table if exists `｣ﾔ｣ｱ｣ｱ`;
-drop table if exists `｣ﾔ｣ｱ｣ｲ`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHAR
 CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺'),('軸'),('宍');
 INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢'),('､､'),('､ｦ');
 INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
@@ -34,9 +28,6 @@ INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
 INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺'),('軸'),('宍');
 INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢'),('､､'),('､ｦ');
 INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
-INSERT INTO `｣ﾔ｣ｱ｣ｰ` VALUES ('竺'),('軸'),('宍');
-INSERT INTO `｣ﾔ｣ｱ｣ｱ` VALUES ('､｢'),('､､'),('､ｦ');
-INSERT INTO `｣ﾔ｣ｱ｣ｲ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
 SELECT * FROM `｣ﾔ｣ｱ`;
 ｣ﾃ｣ｱ
 竺
@@ -82,93 +73,60 @@ SELECT * FROM `｣ﾔ｣ｹ`;
 常ﾜ
 常ﾝ
 常ﾞ
-SELECT * FROM `｣ﾔ｣ｱ｣ｰ`;
-｣ﾃ｣ｱ
-竺
-軸
-宍
-SELECT * FROM `｣ﾔ｣ｱ｣ｱ`;
-｣ﾃ｣ｱ
-､｢
-､､
-､ｦ
-SELECT * FROM `｣ﾔ｣ｱ｣ｲ`;
-｣ﾃ｣ｱ
-常ﾜ
-常ﾝ
-常ﾞ
 SHOW CREATE TABLE `｣ﾔ｣ｱ`;
 Table	Create Table
 ｣ﾔ｣ｱ	CREATE TABLE `｣ﾔ｣ｱ` (
-  `｣ﾃ｣ｱ` enum('竺','軸','宍') default NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｲ`;
 Table	Create Table
 ｣ﾔ｣ｲ	CREATE TABLE `｣ﾔ｣ｲ` (
-  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') default NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｳ`;
 Table	Create Table
 ｣ﾔ｣ｳ	CREATE TABLE `｣ﾔ｣ｳ` (
-  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') default NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｴ`;
 Table	Create Table
 ｣ﾔ｣ｴ	CREATE TABLE `｣ﾔ｣ｴ` (
-  `｣ﾃ｣ｱ` enum('竺','軸','宍') default NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｵ`;
 Table	Create Table
 ｣ﾔ｣ｵ	CREATE TABLE `｣ﾔ｣ｵ` (
-  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') default NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｶ`;
 Table	Create Table
 ｣ﾔ｣ｶ	CREATE TABLE `｣ﾔ｣ｶ` (
-  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') default NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｷ`;
 Table	Create Table
 ｣ﾔ｣ｷ	CREATE TABLE `｣ﾔ｣ｷ` (
-  `｣ﾃ｣ｱ` enum('竺','軸','宍') default NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｸ`;
 Table	Create Table
 ｣ﾔ｣ｸ	CREATE TABLE `｣ﾔ｣ｸ` (
-  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') default NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `｣ﾔ｣ｹ`;
 Table	Create Table
 ｣ﾔ｣ｹ	CREATE TABLE `｣ﾔ｣ｹ` (
-  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') default NULL,
-  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `｣ﾔ｣ｱ｣ｰ`;
-Table	Create Table
-｣ﾔ｣ｱ｣ｰ	CREATE TABLE `｣ﾔ｣ｱ｣ｰ` (
-  `｣ﾃ｣ｱ` enum('竺','軸','宍') default NULL,
-  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `｣ﾔ｣ｱ｣ｱ`;
-Table	Create Table
-｣ﾔ｣ｱ｣ｱ	CREATE TABLE `｣ﾔ｣ｱ｣ｱ` (
-  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') default NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
   KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `｣ﾔ｣ｱ｣ｲ`;
-Table	Create Table
-｣ﾔ｣ｱ｣ｲ	CREATE TABLE `｣ﾔ｣ｱ｣ｲ` (
-  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') default NULL,
-  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DESC `｣ﾔ｣ｱ`;
 Field	Type	Null	Key	Default	Extra
 ｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
@@ -196,14 +154,113 @@ Field	Type	Null	Key	Default	Extra
 DESC `｣ﾔ｣ｹ`;
 Field	Type	Null	Key	Default	Extra
 ｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
-DESC `｣ﾔ｣ｱ｣ｰ`;
+ALTER TABLE `｣ﾔ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｳ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｴ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｵ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｶ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｷ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｸ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｹ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+SHOW CREATE TABLE `｣ﾔ｣ｱ`;
+Table	Create Table
+｣ﾔ｣ｱ	CREATE TABLE `｣ﾔ｣ｱ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｲ`;
+Table	Create Table
+｣ﾔ｣ｲ	CREATE TABLE `｣ﾔ｣ｲ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｳ`;
+Table	Create Table
+｣ﾔ｣ｳ	CREATE TABLE `｣ﾔ｣ｳ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｴ`;
+Table	Create Table
+｣ﾔ｣ｴ	CREATE TABLE `｣ﾔ｣ｴ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｵ`;
+Table	Create Table
+｣ﾔ｣ｵ	CREATE TABLE `｣ﾔ｣ｵ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｶ`;
+Table	Create Table
+｣ﾔ｣ｶ	CREATE TABLE `｣ﾔ｣ｶ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｷ`;
+Table	Create Table
+｣ﾔ｣ｷ	CREATE TABLE `｣ﾔ｣ｷ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｸ`;
+Table	Create Table
+｣ﾔ｣ｸ	CREATE TABLE `｣ﾔ｣ｸ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `｣ﾔ｣ｹ`;
+Table	Create Table
+｣ﾔ｣ｹ	CREATE TABLE `｣ﾔ｣ｹ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+DESC `｣ﾔ｣ｱ`;
 Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
 ｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
-DESC `｣ﾔ｣ｱ｣ｱ`;
+DESC `｣ﾔ｣ｲ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｳ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｴ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｵ`;
 Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
 ｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
-DESC `｣ﾔ｣ｱ｣ｲ`;
+DESC `｣ﾔ｣ｶ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｷ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｸ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｹ`;
 Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
 ｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
 DROP TABLE `｣ﾔ｣ｱ`;
 DROP TABLE `｣ﾔ｣ｲ`;
@@ -214,6 +271,3 @@ DROP TABLE `｣ﾔ｣ｶ`;
 DROP TABLE `｣ﾔ｣ｷ`;
 DROP TABLE `｣ﾔ｣ｸ`;
 DROP TABLE `｣ﾔ｣ｹ`;
-DROP TABLE `｣ﾔ｣ｱ｣ｰ`;
-DROP TABLE `｣ﾔ｣ｱ｣ｱ`;
-DROP TABLE `｣ﾔ｣ｱ｣ｲ`;