Bug #45159 Part 1 : rejuvenate the jp test suite using normal run.

Updates the results of all the out-dated test suites and adds 
the special mysqltest command to enable innodb for the tests that need it.

mysql-test/suite/jp/r/jp_alter_sjis.result

@@ -31,8 +31,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -58,7 +58,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -107,7 +107,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ NULL
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
 構構	char(1)	YES	MUL	NULL	
-表表表	char(6)		PRI		
-能能能	char(1)	YES	MUL	NULL	
+表表表	char(6)	NO	PRI		
+能能能	char(1)	YES	UNI	NULL	
 予予予	char(1)	YES		NULL	
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
@@ -156,7 +156,7 @@ SELECT * FROM `
 表表表表表
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
@@ -193,8 +193,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -220,7 +220,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -269,7 +269,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ NULL
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
 構構	char(1)	YES	MUL	NULL	
-表表表	char(6)		PRI		
-能能能	char(1)	YES	MUL	NULL	
+表表表	char(6)	NO	PRI		
+能能能	char(1)	YES	UNI	NULL	
 予予予	char(1)	YES		NULL	
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
@@ -318,7 +318,7 @@ SELECT * FROM `
 能能能能能
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
@@ -355,8 +355,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY  (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -382,12 +382,12 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY  (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -431,12 +431,12 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ソソソ` ADD `構構構` char(1) FIRST;
 ALTER TABLE `ソソソ` ADD `能能能` char(1) AFTER `表表表`;
 ALTER TABLE `ソソソ` ADD `予予予` char(1);
@@ -453,8 +453,8 @@ NULL
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
 構構	char(1)	YES	MUL	NULL	
-表表表	char(6)		PRI		
-能能能	char(1)	YES	MUL	NULL	
+表表表	char(6)	NO	PRI		
+能能能	char(1)	YES	UNI	NULL	
 予予予	char(1)	YES		NULL	
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY  (`表表表`),
   UNIQUE KEY `能能能` (`能能能`),
   KEY `構構構` (`構構`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ソソソ` DROP INDEX `構構構`;
 ALTER TABLE `ソソソ` DROP PRIMARY KEY;
 ALTER TABLE `ソソソ` DROP INDEX `能能能`;
@@ -480,12 +480,12 @@ SELECT * FROM `
 能能能能能
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
   `表表表` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
 構構	char(1)	YES	MUL	NULL	
-表表表	char(6)		PRI		
+表表表	char(6)	NO	PRI		
 能能能	char(1)	YES		NULL	
 予予予	char(1)	YES		NULL	
 SHOW CREATE TABLE `ソソソ`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 表表表表表
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (

mysql-test/suite/jp/r/jp_alter_ucs2.result

@@ -32,8 +32,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -59,7 +59,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -81,8 +81,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -108,7 +108,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -130,8 +130,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -157,7 +157,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -194,8 +194,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -221,7 +221,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -243,8 +243,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -270,7 +270,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -292,8 +292,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -319,7 +319,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -356,8 +356,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -369,7 +369,7 @@ Table	Create Table
   PRIMARY KEY  (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -383,12 +383,12 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -405,8 +405,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -418,7 +418,7 @@ Table	Create Table
   PRIMARY KEY  (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -432,12 +432,12 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -454,8 +454,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -467,7 +467,7 @@ Table	Create Table
   PRIMARY KEY  (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -481,12 +481,12 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -517,7 +517,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -542,7 +542,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -563,7 +563,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -588,7 +588,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -609,7 +609,7 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -634,7 +634,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

mysql-test/suite/jp/r/jp_alter_ujis.result

@@ -31,8 +31,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -58,7 +58,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -107,7 +107,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -156,7 +156,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -193,8 +193,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -220,7 +220,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -269,7 +269,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -318,7 +318,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -355,8 +355,8 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY  (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -382,12 +382,12 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY  (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -431,12 +431,12 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,8 +453,8 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY  (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -480,12 +480,12 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

mysql-test/suite/jp/r/jp_alter_utf8.result

@@ -31,8 +31,8 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -58,7 +58,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -107,7 +107,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -156,7 +156,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -193,8 +193,8 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -220,7 +220,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -269,7 +269,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -318,7 +318,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -355,8 +355,8 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY  (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -382,12 +382,12 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY  (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -431,12 +431,12 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,8 +453,8 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY  (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -480,12 +480,12 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -633,7 +633,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

mysql-test/suite/jp/r/jp_convert_sjis.result

@@ -278,12 +278,15 @@ SELECT `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ４`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
@@ -527,12 +530,15 @@ SELECT `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
@@ -777,12 +783,15 @@ SELECT `
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1026,12 +1035,15 @@ SELECT `
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;

mysql-test/suite/jp/r/jp_create_db_sjis.result

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `ソ十表`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 ソ十表

mysql-test/suite/jp/r/jp_create_db_ucs2.result

@@ -9,6 +9,7 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

mysql-test/suite/jp/r/jp_create_db_ujis.result

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

mysql-test/suite/jp/r/jp_create_db_utf8.result

@@ -8,6 +8,7 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

mysql-test/suite/jp/r/jp_create_tbl_sjis.result

@@ -22,11 +22,23 @@ CREATE TABLE `
 CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '十十十' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '十十十' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '十十十' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
   `噂噂噂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `十十十`;
 Table	Create Table
 十十十	CREATE TABLE `十十十` (
   `蚕蚕蚕` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `表表表`;
 Table	Create Table
 表表表	CREATE TABLE `表表表` (
   `申申申` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `予予予`;
 Table	Create Table
 予予予	CREATE TEMPORARY TABLE `予予予` (
   `貼貼貼` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `構構構`;
 Table	Create Table
 構構構	CREATE TEMPORARY TABLE `構構構` (
   `能能能` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '十十十' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `表表表`(`申申申`char(1)) DEFAULT CHARSET = sjis engine=BDB;

mysql-test/suite/jp/r/jp_create_tbl_ucs2.result

@@ -22,11 +22,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=BDB;

mysql-test/suite/jp/r/jp_create_tbl_ujis.result

@@ -22,11 +22,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=BDB;

mysql-test/suite/jp/r/jp_create_tbl_utf8.result

@@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=INNO
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MyIS
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=BDB;

mysql-test/suite/jp/r/jp_enum_sjis.result

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ３`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ソ','十','表')	YES	MUL	NULL	
 DESC `Ｔ４`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ５`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ６`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ソ','十','表')	YES	MUL	NULL	
 DESC `Ｔ７`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ８`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ソ','十','表')	YES	MUL	NULL	
 DESC `Ｔ１０`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ１１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ１２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ソ','十','表')	YES	MUL	NULL	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

mysql-test/suite/jp/r/jp_enum_ucs2.result

@@ -138,19 +138,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` 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
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (

mysql-test/suite/jp/r/jp_enum_ujis.result

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ３`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ４`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ５`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ６`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ７`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ８`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ１０`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ１１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ１２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

mysql-test/suite/jp/r/jp_enum_utf8.result

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ３`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ４`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ５`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ６`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ７`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ８`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ１０`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ１１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ１２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

mysql-test/suite/jp/r/jp_select_sjis.result

@@ -118,6 +118,7 @@ SELECT * FROM `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT * FROM `Ｔ３`;
 Ｃ１
+
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT * FROM `Ｔ４`;
 Ｃ１
@@ -201,6 +202,7 @@ SELECT * FROM `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT * FROM `Ｔ６`;
 Ｃ１
+
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT * FROM `Ｔ７`;
 Ｃ１
@@ -285,6 +287,7 @@ SELECT * FROM `
 SELECT * FROM `Ｔ９`;
 Ｃ１
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+
 SELECT * FROM `Ｔ１０`;
 Ｃ１
  !"#$%&'()*+,-./
@@ -368,6 +371,7 @@ SELECT * FROM `
 SELECT * FROM `Ｔ１２`;
 Ｃ１
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;

mysql-test/suite/jp/t/jp_alter_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;

mysql-test/suite/jp/t/jp_alter_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_alter_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_alter_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
 DROP TABLE IF EXISTS `ｲｲｲ`;

mysql-test/suite/jp/t/jp_charlength_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_charlength_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_charlength_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_charlength_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_charset_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `sP`;

mysql-test/suite/jp/t/jp_charset_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_charset_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_charset_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_convert_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;

mysql-test/suite/jp/t/jp_convert_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_convert_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_convert_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_create_tbl_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;

mysql-test/suite/jp/t/jp_create_tbl_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_create_tbl_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_create_tbl_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
 DROP TABLE IF EXISTS `ｲｲｲ`;

mysql-test/suite/jp/t/jp_enum_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_enum_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 # half-with kana is not handled correctly in 4.1

mysql-test/suite/jp/t/jp_enum_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_enum_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_insert_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_insert_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_insert_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_insert_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_instr_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_instr_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_instr_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_instr_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_join_sjis.test

+-- source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_join_ucs2.test

+-- source include/have_innodb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_join_ujis.test

+-- source include/have_innodb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_join_utf8.test

+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_left_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_left_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_left_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_left_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_length_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_length_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_length_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_length_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_like_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_like_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_like_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_like_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_locate_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_locate_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_locate_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_locate_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_lpad_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_lpad_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_lpad_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_lpad_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_ltrim_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_ltrim_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_ltrim_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_ltrim_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_ps_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/suite/jp/t/jp_ps_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_replace_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_replace_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_replace_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_replace_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_reverse_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_reverse_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_reverse_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_reverse_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_right_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_right_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_right_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_right_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

mysql-test/suite/jp/t/jp_rpad_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_rpad_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_rpad_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_rpad_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;