1 files changed, 52 insertions, 135 deletions

diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result
index 1e46dbffbb1..cc68c1536a0 100644
--- a/mysql-test/suite/jp/r/jp_enum_sjis.result
+++ b/mysql-test/suite/jp/r/jp_enum_sjis.result
@@ -7,9 +7,7 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
+drop table if exists t1;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +16,9 @@ CREATE TABLE `�s�R` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET
 CREATE TABLE `�s�S` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�Q` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�R` VALUES ('�\'),('�\'),('�\');
@@ -33,9 +28,6 @@ INSERT INTO `�s�U` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�V` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�W` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�X` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�O` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�P` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Q` VALUES ('�\'),('�\'),('�\');
 SELECT * FROM `�s�P`;
 �b�P
 �
@@ -81,93 +73,60 @@ SELECT * FROM `�s�X`;
 �\
 �\
 �\
-SELECT * FROM `�s�P�O`;
-�b�P
-�
-�
-�
-SELECT * FROM `�s�P�P`;
-�b�P
-��
-��
-��
-SELECT * FROM `�s�P�Q`;
-�b�P
-�\
-�\
-�\
 SHOW CREATE TABLE `�s�P`;
 Table	Create Table
 �s�P	CREATE TABLE `�s�P` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
-  `�b�P` enum('�\','�\','�\') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�O`;
-Table	Create Table
-�s�P�O	CREATE TABLE `�s�P�O` (
-  `�b�P` enum('�','�','�') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�P`;
-Table	Create Table
-�s�P�P	CREATE TABLE `�s�P�P` (
-  `�b�P` enum('��','��','��') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�Q`;
-Table	Create Table
-�s�P�Q	CREATE TABLE `�s�P�Q` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DESC `�s�P`;
 Field	Type	Null	Key	Default	Extra
 �b�P	enum('�','�','�')	YES	MUL	NULL	
@@ -195,15 +154,6 @@ Field	Type	Null	Key	Default	Extra
 DESC `�s�X`;
 Field	Type	Null	Key	Default	Extra
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
-DESC `�s�P�O`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('�','�','�')	YES	MUL	NULL	
-DESC `�s�P�P`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('��','��','��')	YES	MUL	NULL	
-DESC `�s�P�Q`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 ALTER TABLE `�s�P` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�Q` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�R` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
@@ -213,140 +163,110 @@ ALTER TABLE `�s�U` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�V` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�W` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�X` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�O` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�P` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�Q` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `�s�P`;
 Table	Create Table
 �s�P	CREATE TABLE `�s�P` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�O`;
-Table	Create Table
-�s�P�O	CREATE TABLE `�s�P�O` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�P`;
-Table	Create Table
-�s�P�P	CREATE TABLE `�s�P�P` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�Q`;
-Table	Create Table
-�s�P�Q	CREATE TABLE `�s�P�Q` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
+CREATE TABLE t1(c1 enum('�S','�s')) default character set = sjis;
+INSERT INTO t1 VALUES('�S'),('�s');
+SELECT * FROM t1 WHERE c1 LIKE '�S';
+c1
+�S
+DROP TABLE t1;
 DESC `�s�P`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�Q`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�R`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DESC `�s�S`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�T`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�U`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DESC `�s�V`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�W`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�X`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('�\','�\','�\')	YES	MUL	NULL	
-DESC `�s�P�O`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('�','�','�')	YES	MUL	NULL	
-DESC `�s�P�P`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('��','��','��')	YES	MUL	NULL	
-DESC `�s�P�Q`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
@@ -357,6 +277,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;