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 `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
@@ -58,7 +58,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
@@ -80,8 +80,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -107,7 +107,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -129,8 +129,8 @@ NULL
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD>\<5C>\	char(1)	YES	MUL	NULL	
-<EFBFBD>\<5C>\<5C>\	char(6)		PRI		
+<EFBFBD>\<5C>\<5C>\	char(6)	NO	PRI		
-<EFBFBD>\<5C>\<5C>\	char(1)	YES	MUL	NULL	
+<EFBFBD>\<5C>\<5C>\	char(1)	YES	UNI	NULL	
 <EFBFBD>\<5C>\<5C>\	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
@@ -156,7 +156,7 @@ SELECT * FROM `
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>\<5C>\<5C>\	char(6)				
+<EFBFBD>\<5C>\<5C>\	char(6)	NO			
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
@@ -193,8 +193,8 @@ NULL
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
@@ -220,7 +220,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
@@ -242,8 +242,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -269,7 +269,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -291,8 +291,8 @@ NULL
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD>\<5C>\	char(1)	YES	MUL	NULL	
-<EFBFBD>\<5C>\<5C>\	char(6)		PRI		
+<EFBFBD>\<5C>\<5C>\	char(6)	NO	PRI		
-<EFBFBD>\<5C>\<5C>\	char(1)	YES	MUL	NULL	
+<EFBFBD>\<5C>\<5C>\	char(1)	YES	UNI	NULL	
 <EFBFBD>\<5C>\<5C>\	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
@@ -318,7 +318,7 @@ SELECT * FROM `
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>\<5C>\<5C>\	char(6)				
+<EFBFBD>\<5C>\<5C>\	char(6)	NO			
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
@@ -355,8 +355,8 @@ NULL
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD>` (`<60><><EFBFBD>`),
   KEY `<60><><EFBFBD>` (`<60><>`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `<60><><EFBFBD>` DROP INDEX `<60><><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD>` DROP INDEX `<60><><EFBFBD>`;
@@ -382,12 +382,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) FIRST;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) AFTER `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1);
@@ -404,8 +404,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -431,12 +431,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `<60>\<5C>\<5C>\` ADD `<60>\<5C>\<5C>\` char(1) FIRST;
 ALTER TABLE `<60>\<5C>\<5C>\` ADD `<60>\<5C>\<5C>\` char(1) AFTER `<60>\<5C>\<5C>\`;
 ALTER TABLE `<60>\<5C>\<5C>\` ADD `<60>\<5C>\<5C>\` char(1);
@@ -453,8 +453,8 @@ NULL
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD>\<5C>\	char(1)	YES	MUL	NULL	
-<EFBFBD>\<5C>\<5C>\	char(6)		PRI		
+<EFBFBD>\<5C>\<5C>\	char(6)	NO	PRI		
-<EFBFBD>\<5C>\<5C>\	char(1)	YES	MUL	NULL	
+<EFBFBD>\<5C>\<5C>\	char(1)	YES	UNI	NULL	
 <EFBFBD>\<5C>\<5C>\	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY  (`<60>\<5C>\<5C>\`),
   UNIQUE KEY `<60>\<5C>\<5C>\` (`<60>\<5C>\<5C>\`),
   KEY `<60>\<5C>\<5C>\` (`<60>\<5C>\`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `<60>\<5C>\<5C>\` DROP INDEX `<60>\<5C>\<5C>\`;
 ALTER TABLE `<60>\<5C>\<5C>\` DROP PRIMARY KEY;
 ALTER TABLE `<60>\<5C>\<5C>\` DROP INDEX `<60>\<5C>\<5C>\`;
@@ -480,12 +480,12 @@ SELECT * FROM `
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>\<5C>\<5C>\	char(6)				
+<EFBFBD>\<5C>\<5C>\	char(6)	NO			
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `<60><><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -516,7 +516,7 @@ NULL
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD>`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
@@ -562,7 +562,7 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -608,7 +608,7 @@ NULL
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD>\<5C>\	char(1)	YES	MUL	NULL	
-<EFBFBD>\<5C>\<5C>\	char(6)		PRI		
+<EFBFBD>\<5C>\<5C>\	char(6)	NO	PRI		
 <EFBFBD>\<5C>\<5C>\	char(1)	YES		NULL	
 <EFBFBD>\<5C>\<5C>\	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\
 DESC `<60>\<5C>\<5C>\`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>\<5C>\<5C>\	char(6)				
+<EFBFBD>\<5C>\<5C>\	char(6)	NO			
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (

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

@@ -32,8 +32,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -59,7 +59,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -81,8 +81,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -108,7 +108,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -130,8 +130,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -157,7 +157,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
@@ -194,8 +194,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -221,7 +221,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -243,8 +243,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -270,7 +270,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -292,8 +292,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -319,7 +319,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
@@ -356,8 +356,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -369,7 +369,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -383,12 +383,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) FIRST;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) AFTER `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1);
@@ -405,8 +405,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -418,7 +418,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -432,12 +432,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) FIRST;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) AFTER `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1);
@@ -454,8 +454,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -467,7 +467,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP PRIMARY KEY;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -481,12 +481,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -517,7 +517,7 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -542,7 +542,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -563,7 +563,7 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -588,7 +588,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -609,7 +609,7 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
@@ -634,7 +634,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (

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

@@ -31,8 +31,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -58,7 +58,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -80,8 +80,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -107,7 +107,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -129,8 +129,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -156,7 +156,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
@@ -193,8 +193,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -220,7 +220,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -242,8 +242,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -269,7 +269,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -291,8 +291,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -318,7 +318,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
@@ -355,8 +355,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -382,12 +382,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) FIRST;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) AFTER `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1);
@@ -404,8 +404,8 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP PRIMARY KEY;
 ALTER TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -431,12 +431,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) FIRST;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) AFTER `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` ADD `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1);
@@ -453,8 +453,8 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	UNI	NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY  (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   UNIQUE KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`),
   KEY `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP PRIMARY KEY;
 ALTER TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` DROP INDEX `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -480,12 +480,12 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -516,7 +516,7 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -562,7 +562,7 @@ NULL
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
@@ -608,7 +608,7 @@ NULL
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES	MUL	NULL	
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)		PRI		
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO	PRI		
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(1)	YES		NULL	
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 DESC `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)				
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(6)	NO			
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (

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(6)	NO	PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｸｸｸ	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(6)	NO	PRI		
-くくく	char(1)	YES	MUL	NULL	
+くくく	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(6)	NO	PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丅丅丅	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(6)	NO	PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｸｸｸ	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(6)	NO	PRI		
-くくく	char(1)	YES	MUL	NULL	
+くくく	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(6)	NO	PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丅丅丅	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(6)	NO	PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｸｸｸ	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(6)	NO	PRI		
-くくく	char(1)	YES	MUL	NULL	
+くくく	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(6)	NO	PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丅丅丅	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 `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EFBFBD>E<EFBFBD>E<EFBFBD>E<EFBFBD>E	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EA9E81>E<EFBFBD>E<EFBFBD>E<EFBFBD>E
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>R`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ucs2) FROM `<60>s<EFBFBD>R`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ucs2)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ujis) FROM `<60>s<EFBFBD>R`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ujis)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>S`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
@@ -527,12 +530,15 @@ SELECT `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EFBFBD>E<EFBFBD>E<EFBFBD>E<EFBFBD>E	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EA9E81>E<EFBFBD>E<EFBFBD>E<EFBFBD>E
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>U`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ucs2) FROM `<60>s<EFBFBD>U`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ucs2)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ujis) FROM `<60>s<EFBFBD>U`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ujis)
+	
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>V`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
@@ -777,12 +783,15 @@ SELECT `
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>X`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ucs2) FROM `<60>s<EFBFBD>X`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ucs2)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ujis) FROM `<60>s<EFBFBD>X`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ujis)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>P<EFBFBD>O`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1026,12 +1035,15 @@ SELECT `
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using utf8) FROM `<60>s<EFBFBD>P<EFBFBD>Q`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using utf8)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ucs2) FROM `<60>s<EFBFBD>P<EFBFBD>Q`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ucs2)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 SELECT `<60>b<EFBFBD>P`, CONVERT(`<60>b<EFBFBD>P` using ujis) FROM `<60>s<EFBFBD>P<EFBFBD>Q`;
 <EFBFBD>b<EFBFBD>P	CONVERT(`<60>b<EFBFBD>P` using ujis)
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\	<09>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+	
 drop table `<60>s<EFBFBD>P`;
 drop table `<60>s<EFBFBD>Q`;
 drop table `<60>s<EFBFBD>R`;

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

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `<60>\<5C>\<5C>\`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 <EFBFBD>\<5C>\<5C>\

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

@@ -9,6 +9,7 @@ CREATE DATABASE `
 CREATE DATABASE `<60><>܏<EFBFBD>ݏ<EFBFBD><DD8F>`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 <EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD>

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

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `<60><>܏<EFBFBD>ݏ<EFBFBD><DD8F>`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 <EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD>

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 `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\`char(1)) DEFAULT CHARSET = sjis engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\`char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\`char(1)) DEFAULT CHARSET = sjis engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD>` (
   `<60><><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TEMPORARY TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>\<5C>\<5C>\`;
 Table	Create Table
 <EFBFBD>\<5C>\<5C>\	CREATE TEMPORARY TABLE `<60>\<5C>\<5C>\` (
   `<60>\<5C>\<5C>\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `<60><><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD>`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '<27>\<5C>\<5C>\' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD>`(`<60><><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = sjis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60>\<5C>\<5C>\`(`<60>\<5C>\<5C>\`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 `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ޏ<EFBFBD>ޏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ߏ<EFBFBD>ߏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`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 `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ujis engine=INNODB;
@@ -178,11 +190,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
@@ -334,11 +358,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`char(1)) DEFAULT CHARSET = ujis engine=HEAP;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ݏ<EFBFBD>ݏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ޏ<EFBFBD>ޏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`;
 Table	Create Table
 <EFBFBD><EFBFBD>ߏ<EFBFBD>ߏ<EFBFBD><EFBFBD>	CREATE TABLE `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 Table	Create Table
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TEMPORARY TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
   `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
 DROP TABLE `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 CREATE TABLE `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><>ݏ<EFBFBD>ݏ<EFBFBD><DD8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '<27><>ޏ<EFBFBD>ޏ<EFBFBD><DE8F>' already exists
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(1)) DEFAULT CHARSET = ujis engine=BDB;
 CREATE TABLE IF NOT EXISTS `<60><>ߏ<EFBFBD>ߏ<EFBFBD><DF8F>`(`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`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
 <EFBFBD>s<EFBFBD>V	CREATE TABLE `<60>s<EFBFBD>V` (
   `<60>b<EFBFBD>P` enum('<27>','<27>','<27>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>W`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>W	CREATE TABLE `<60>s<EFBFBD>W` (
   `<60>b<EFBFBD>P` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>X`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>X	CREATE TABLE `<60>s<EFBFBD>X` (
   `<60>b<EFBFBD>P` enum('<27>\','<27>\','<27>\') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>O`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>P<EFBFBD>O	CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>O` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `<60>s<EFBFBD>P`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>P	CREATE TABLE `<60>s<EFBFBD>P` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>','<27>','<27>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>Q`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>Q	CREATE TABLE `<60>s<EFBFBD>Q` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>R`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>R	CREATE TABLE `<60>s<EFBFBD>R` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>\','<27>\','<27>\') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>S`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>S	CREATE TABLE `<60>s<EFBFBD>S` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>','<27>','<27>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>T`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>T	CREATE TABLE `<60>s<EFBFBD>T` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>U`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>U	CREATE TABLE `<60>s<EFBFBD>U` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>\','<27>\','<27>\') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>V`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>V	CREATE TABLE `<60>s<EFBFBD>V` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>','<27>','<27>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>W`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>W	CREATE TABLE `<60>s<EFBFBD>W` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>X`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>X	CREATE TABLE `<60>s<EFBFBD>X` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>\','<27>\','<27>\') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>O`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>P<EFBFBD>O	CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>O` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>','<27>','<27>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>P`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>P<EFBFBD>P	CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>P` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>Q`;
 Table	Create Table
 <EFBFBD>s<EFBFBD>P<EFBFBD>Q	CREATE TABLE `<60>s<EFBFBD>P<EFBFBD>Q` (
-  `<60>b<EFBFBD>Q` char(1) NOT NULL default '',
+  `<60>b<EFBFBD>Q` char(1) NOT NULL,
   `<60>b<EFBFBD>P` enum('<27>\','<27>\','<27>\') default NULL,
   KEY `<60>b<EFBFBD>P` (`<60>b<EFBFBD>P`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 DESC `<60>s<EFBFBD>P`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>','<27>','<27>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>Q`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>R`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>\','<27>\','<27>\')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>S`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>','<27>','<27>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>T`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>U`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>\','<27>\','<27>\')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>V`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>','<27>','<27>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>W`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>X`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>\','<27>\','<27>\')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>P<EFBFBD>O`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>','<27>','<27>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>P<EFBFBD>P`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>s<EFBFBD>P<EFBFBD>Q`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>b<EFBFBD>Q	char(1)				
+<EFBFBD>b<EFBFBD>Q	char(1)	NO		NULL	
 <EFBFBD>b<EFBFBD>P	enum('<27>\','<27>\','<27>\')	YES	MUL	NULL	
 DROP TABLE `<60>s<EFBFBD>P`;
 DROP TABLE `<60>s<EFBFBD>Q`;

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

@@ -138,19 +138,19 @@ Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>` (

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

@@ -137,19 +137,19 @@ Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><>','<27><>','<27><>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Table	Create Table
 <EFBFBD>ԣ<EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<60>ԣ<EFBFBD><D4A3><EFBFBD>` (
-  `<60>ã<EFBFBD>` char(1) NOT NULL default '',
+  `<60>ã<EFBFBD>` char(1) NOT NULL,
   `<60>ã<EFBFBD>` enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>') default NULL,
   KEY `<60>ã<EFBFBD>` (`<60>ã<EFBFBD>`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><>','<27><>','<27><>')	YES	MUL	NULL	
 DESC `<60>ԣ<EFBFBD><D4A3><EFBFBD>`;
 Field	Type	Null	Key	Default	Extra
-<EFBFBD>ã<EFBFBD>	char(1)				
+<EFBFBD>ã<EFBFBD>	char(1)	NO		NULL	
 <EFBFBD>ã<EFBFBD>	enum('<27><><EFBFBD>','<27><><EFBFBD>','<27><><EFBFBD>')	YES	MUL	NULL	
 DROP TABLE `<60>ԣ<EFBFBD>`;
 DROP TABLE `<60>ԣ<EFBFBD>`;

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_join_sjis.result

@@ -71,31 +71,31 @@ SELECT * FROM `
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Pa` JOIN `<60>s<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Pa` INNER JOIN `<60>s<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Pa` CROSS JOIN `<60>s<EFBFBD>Pb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Pa` LEFT JOIN `<60>s<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Pa` LEFT JOIN `<60>s<EFBFBD>Pb` ON (`<60>s<EFBFBD>Pa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Pb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	NULL
 <EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Pb` RIGHT JOIN `<60>s<EFBFBD>Pa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Pb` RIGHT JOIN `<60>s<EFBFBD>Pa` ON (`<60>s<EFBFBD>Pa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Pb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
@@ -112,31 +112,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Qa` JOIN `<60>s<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Qa` INNER JOIN `<60>s<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Qa` CROSS JOIN `<60>s<EFBFBD>Qb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Qa` LEFT JOIN `<60>s<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Qa` LEFT JOIN `<60>s<EFBFBD>Qb` ON (`<60>s<EFBFBD>Qa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Qb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Qb` RIGHT JOIN `<60>s<EFBFBD>Qa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Qb` RIGHT JOIN `<60>s<EFBFBD>Qa` ON (`<60>s<EFBFBD>Qa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Qb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
@@ -153,31 +153,31 @@ SELECT * FROM `
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Ra` JOIN `<60>s<EFBFBD>Rb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ra` INNER JOIN `<60>s<EFBFBD>Rb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ra` CROSS JOIN `<60>s<EFBFBD>Rb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Ra` LEFT JOIN `<60>s<EFBFBD>Rb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ra` LEFT JOIN `<60>s<EFBFBD>Rb` ON (`<60>s<EFBFBD>Ra`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Rb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	NULL
 <EFBFBD>\	NULL
 SELECT * FROM `<60>s<EFBFBD>Rb` RIGHT JOIN `<60>s<EFBFBD>Ra` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Rb` RIGHT JOIN `<60>s<EFBFBD>Ra` ON (`<60>s<EFBFBD>Ra`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Rb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
@@ -194,31 +194,31 @@ SELECT * FROM `
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Sa` JOIN `<60>s<EFBFBD>Sb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Sa` INNER JOIN `<60>s<EFBFBD>Sb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Sa` CROSS JOIN `<60>s<EFBFBD>Sb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Sa` LEFT JOIN `<60>s<EFBFBD>Sb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Sa` LEFT JOIN `<60>s<EFBFBD>Sb` ON (`<60>s<EFBFBD>Sa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Sb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	NULL
 <EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Sb` RIGHT JOIN `<60>s<EFBFBD>Sa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Sb` RIGHT JOIN `<60>s<EFBFBD>Sa` ON (`<60>s<EFBFBD>Sa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Sb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
@@ -235,31 +235,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Ta` JOIN `<60>s<EFBFBD>Tb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Ta` INNER JOIN `<60>s<EFBFBD>Tb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Ta` CROSS JOIN `<60>s<EFBFBD>Tb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Ta` LEFT JOIN `<60>s<EFBFBD>Tb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Ta` LEFT JOIN `<60>s<EFBFBD>Tb` ON (`<60>s<EFBFBD>Ta`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Tb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Tb` RIGHT JOIN `<60>s<EFBFBD>Ta` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Tb` RIGHT JOIN `<60>s<EFBFBD>Ta` ON (`<60>s<EFBFBD>Ta`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Tb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
@@ -276,31 +276,31 @@ SELECT * FROM `
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Ua` JOIN `<60>s<EFBFBD>Ub` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ua` INNER JOIN `<60>s<EFBFBD>Ub` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ua` CROSS JOIN `<60>s<EFBFBD>Ub`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Ua` LEFT JOIN `<60>s<EFBFBD>Ub` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ua` LEFT JOIN `<60>s<EFBFBD>Ub` ON (`<60>s<EFBFBD>Ua`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Ub`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	NULL
 <EFBFBD>\	NULL
 SELECT * FROM `<60>s<EFBFBD>Ub` RIGHT JOIN `<60>s<EFBFBD>Ua` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Ub` RIGHT JOIN `<60>s<EFBFBD>Ua` ON (`<60>s<EFBFBD>Ua`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Ub`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
@@ -317,31 +317,31 @@ SELECT * FROM `
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Va` JOIN `<60>s<EFBFBD>Vb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Va` INNER JOIN `<60>s<EFBFBD>Vb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Va` CROSS JOIN `<60>s<EFBFBD>Vb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>Va` LEFT JOIN `<60>s<EFBFBD>Vb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Va` LEFT JOIN `<60>s<EFBFBD>Vb` ON (`<60>s<EFBFBD>Va`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Vb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	NULL
 <EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Vb` RIGHT JOIN `<60>s<EFBFBD>Va` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Vb` RIGHT JOIN `<60>s<EFBFBD>Va` ON (`<60>s<EFBFBD>Va`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Vb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
@@ -358,31 +358,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Wa` JOIN `<60>s<EFBFBD>Wb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Wa` INNER JOIN `<60>s<EFBFBD>Wb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Wa` CROSS JOIN `<60>s<EFBFBD>Wb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>Wa` LEFT JOIN `<60>s<EFBFBD>Wb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Wa` LEFT JOIN `<60>s<EFBFBD>Wb` ON (`<60>s<EFBFBD>Wa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Wb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>Wb` RIGHT JOIN `<60>s<EFBFBD>Wa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>Wb` RIGHT JOIN `<60>s<EFBFBD>Wa` ON (`<60>s<EFBFBD>Wa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Wb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
@@ -399,31 +399,31 @@ SELECT * FROM `
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Xa` JOIN `<60>s<EFBFBD>Xb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Xa` INNER JOIN `<60>s<EFBFBD>Xb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Xa` CROSS JOIN `<60>s<EFBFBD>Xb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>Xa` LEFT JOIN `<60>s<EFBFBD>Xb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Xa` LEFT JOIN `<60>s<EFBFBD>Xb` ON (`<60>s<EFBFBD>Xa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Xb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	NULL
 <EFBFBD>\	NULL
 SELECT * FROM `<60>s<EFBFBD>Xb` RIGHT JOIN `<60>s<EFBFBD>Xa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>Xb` RIGHT JOIN `<60>s<EFBFBD>Xa` ON (`<60>s<EFBFBD>Xa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>Xb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
@@ -440,31 +440,31 @@ SELECT * FROM `
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Oa` JOIN `<60>s<EFBFBD>P<EFBFBD>Ob` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Oa` INNER JOIN `<60>s<EFBFBD>P<EFBFBD>Ob` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Oa` CROSS JOIN `<60>s<EFBFBD>P<EFBFBD>Ob`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 <EFBFBD>	<09>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Oa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Ob` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
-<EFBFBD>	NULL
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Oa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Ob` ON (`<60>s<EFBFBD>P<EFBFBD>Oa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Ob`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
 <EFBFBD>	NULL
 <EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Ob` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Oa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>	<09>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
-NULL	<EFBFBD>
+<EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Ob` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Oa` ON (`<60>s<EFBFBD>P<EFBFBD>Oa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Ob`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>	<09>
@@ -481,31 +481,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pa` JOIN `<60>s<EFBFBD>P<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pa` INNER JOIN `<60>s<EFBFBD>P<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pa` CROSS JOIN `<60>s<EFBFBD>P<EFBFBD>Pb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Pb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Pb` ON (`<60>s<EFBFBD>P<EFBFBD>Pa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Pb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pb` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Pa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Pb` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Pa` ON (`<60>s<EFBFBD>P<EFBFBD>Pa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Pb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD><EFBFBD>	<09><>
@@ -522,31 +522,31 @@ SELECT * FROM `
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qa` JOIN `<60>s<EFBFBD>P<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qa` INNER JOIN `<60>s<EFBFBD>P<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qa` CROSS JOIN `<60>s<EFBFBD>P<EFBFBD>Qb`;
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 <EFBFBD>\	<09>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Qb` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
-<EFBFBD>\	NULL
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qa` LEFT JOIN `<60>s<EFBFBD>P<EFBFBD>Qb` ON (`<60>s<EFBFBD>P<EFBFBD>Qa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Qb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\
 <EFBFBD>\	NULL
 <EFBFBD>\	NULL
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qb` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Qa` USING (`<60>b<EFBFBD>P`);
-<EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
+<EFBFBD>b<EFBFBD>P
-<EFBFBD>\	<09>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
-NULL	<EFBFBD>\
+<EFBFBD>\
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Qb` RIGHT JOIN `<60>s<EFBFBD>P<EFBFBD>Qa` ON (`<60>s<EFBFBD>P<EFBFBD>Qa`.`<60>b<EFBFBD>P` = `<60>s<EFBFBD>P<EFBFBD>Qb`.`<60>b<EFBFBD>P`);
 <EFBFBD>b<EFBFBD>P	<09>b<EFBFBD>P
 <EFBFBD>\	<09>\

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

@@ -72,31 +72,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -113,31 +113,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -154,31 +154,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -195,31 +195,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -236,31 +236,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -277,31 +277,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -318,31 +318,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -359,31 +359,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -400,31 +400,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -441,31 +441,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -482,31 +482,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -523,31 +523,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>

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

@@ -71,31 +71,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -112,31 +112,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -153,31 +153,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -194,31 +194,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -235,31 +235,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -276,31 +276,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -317,31 +317,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -358,31 +358,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -399,31 +399,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD>b` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD>a` ON (`<60>ԣ<EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
@@ -440,31 +440,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -481,31 +481,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	<09><>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
 <EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD>	<09><>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD>	<09><>
@@ -522,31 +522,31 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` INNER JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` CROSS JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`;
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	NULL
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` LEFT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 <EFBFBD><EFBFBD><EFBFBD>	NULL
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` USING (`<60>ã<EFBFBD>`);
-<EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
+<EFBFBD>ã<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
-NULL	<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>
 SELECT * FROM `<60>ԣ<EFBFBD><D4A3><EFBFBD>b` RIGHT JOIN `<60>ԣ<EFBFBD><D4A3><EFBFBD>a` ON (`<60>ԣ<EFBFBD><D4A3><EFBFBD>a`.`<60>ã<EFBFBD>` = `<60>ԣ<EFBFBD><D4A3><EFBFBD>b`.`<60>ã<EFBFBD>`);
 <EFBFBD>ã<EFBFBD>	<09>ã<EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD>	<09><><EFBFBD>

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

@@ -71,31 +71,31 @@ SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`;
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ１a` CROSS JOIN `Ｔ１b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-ｶ	NULL
+ｶ
-ｻ	NULL
+ｻ
 SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	NULL
 ｻ	NULL
 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-NULL	ｶ
+ｶ
-NULL	ｻ
+ｻ
 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -112,31 +112,31 @@ SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b`;
 か	あ
 さ	あ
 SELECT * FROM `Ｔ２a` JOIN `Ｔ２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ２a` CROSS JOIN `Ｔ２b`;
 Ｃ１	Ｃ１
 あ	あ
 か	あ
 さ	あ
 SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-か	NULL
+か
-さ	NULL
+さ
 SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
 か	NULL
 さ	NULL
 SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-NULL	か
+か
-NULL	さ
+さ
 SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -153,31 +153,31 @@ SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b`;
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ３a` JOIN `Ｔ３b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ３a` CROSS JOIN `Ｔ３b`;
 Ｃ１	Ｃ１
 龔	龔
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-龖	NULL
+龖
-龗	NULL
+龗
 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 龖	NULL
 龗	NULL
 SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-NULL	龖
+龖
-NULL	龗
+龗
 SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
@@ -194,31 +194,31 @@ SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b`;
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ４a` JOIN `Ｔ４b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ４a` CROSS JOIN `Ｔ４b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-ｶ	NULL
+ｶ
-ｻ	NULL
+ｻ
 SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	NULL
 ｻ	NULL
 SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-NULL	ｶ
+ｶ
-NULL	ｻ
+ｻ
 SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -235,31 +235,31 @@ SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b`;
 か	あ
 さ	あ
 SELECT * FROM `Ｔ５a` JOIN `Ｔ５b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ５a` CROSS JOIN `Ｔ５b`;
 Ｃ１	Ｃ１
 あ	あ
 か	あ
 さ	あ
 SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-か	NULL
+か
-さ	NULL
+さ
 SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
 か	NULL
 さ	NULL
 SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-NULL	か
+か
-NULL	さ
+さ
 SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -276,31 +276,31 @@ SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b`;
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ６a` JOIN `Ｔ６b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ６a` CROSS JOIN `Ｔ６b`;
 Ｃ１	Ｃ１
 龔	龔
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-龖	NULL
+龖
-龗	NULL
+龗
 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 龖	NULL
 龗	NULL
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-NULL	龖
+龖
-NULL	龗
+龗
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
@@ -317,31 +317,31 @@ SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`;
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ７a` CROSS JOIN `Ｔ７b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-ｶ	NULL
+ｶ
-ｻ	NULL
+ｻ
 SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	NULL
 ｻ	NULL
 SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-NULL	ｶ
+ｶ
-NULL	ｻ
+ｻ
 SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -358,31 +358,31 @@ SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b`;
 か	あ
 さ	あ
 SELECT * FROM `Ｔ８a` JOIN `Ｔ８b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ８a` CROSS JOIN `Ｔ８b`;
 Ｃ１	Ｃ１
 あ	あ
 か	あ
 さ	あ
 SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-か	NULL
+か
-さ	NULL
+さ
 SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
 か	NULL
 さ	NULL
 SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-NULL	か
+か
-NULL	さ
+さ
 SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -399,31 +399,31 @@ SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b`;
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ９a` JOIN `Ｔ９b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ９a` CROSS JOIN `Ｔ９b`;
 Ｃ１	Ｃ１
 龔	龔
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-龖	NULL
+龖
-龗	NULL
+龗
 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 龖	NULL
 龗	NULL
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-NULL	龖
+龖
-NULL	龗
+龗
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
@@ -440,31 +440,31 @@ SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b`;
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
 SELECT * FROM `Ｔ１０a` CROSS JOIN `Ｔ１０b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	ｱ
 ｻ	ｱ
 SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-ｶ	NULL
+ｶ
-ｻ	NULL
+ｻ
 SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
 ｶ	NULL
 ｻ	NULL
 SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-ｱ	ｱ
+ｱ
-NULL	ｶ
+ｶ
-NULL	ｻ
+ｻ
 SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -481,31 +481,31 @@ SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b`;
 か	あ
 さ	あ
 SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
 SELECT * FROM `Ｔ１１a` CROSS JOIN `Ｔ１１b`;
 Ｃ１	Ｃ１
 あ	あ
 か	あ
 さ	あ
 SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-か	NULL
+か
-さ	NULL
+さ
 SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
 か	NULL
 さ	NULL
 SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-あ	あ
+あ
-NULL	か
+か
-NULL	さ
+さ
 SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -522,31 +522,31 @@ SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b`;
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
 SELECT * FROM `Ｔ１２a` CROSS JOIN `Ｔ１２b`;
 Ｃ１	Ｃ１
 龔	龔
 龖	龔
 龗	龔
 SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-龖	NULL
+龖
-龗	NULL
+龗
 SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 龖	NULL
 龗	NULL
 SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`);
-Ｃ１	Ｃ１
+Ｃ１
-龔	龔
+龔
-NULL	龖
+龖
-NULL	龗
+龗
 SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔

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

@@ -118,6 +118,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EFBFBD>E<EFBFBD>E<EFBFBD>E<EFBFBD>E
 SELECT * FROM `<60>s<EFBFBD>R`;
 <EFBFBD>b<EFBFBD>P
+
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT * FROM `<60>s<EFBFBD>S`;
 <EFBFBD>b<EFBFBD>P
@@ -201,6 +202,7 @@ SELECT * FROM `
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꞁE<EFBFBD>E<EFBFBD>E<EFBFBD>E<EFBFBD>E
 SELECT * FROM `<60>s<EFBFBD>U`;
 <EFBFBD>b<EFBFBD>P
+
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
 SELECT * FROM `<60>s<EFBFBD>V`;
 <EFBFBD>b<EFBFBD>P
@@ -285,6 +287,7 @@ SELECT * FROM `
 SELECT * FROM `<60>s<EFBFBD>X`;
 <EFBFBD>b<EFBFBD>P
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>O`;
 <EFBFBD>b<EFBFBD>P
  !"#$%&'()*+,-./
@@ -368,6 +371,7 @@ SELECT * FROM `
 SELECT * FROM `<60>s<EFBFBD>P<EFBFBD>Q`;
 <EFBFBD>b<EFBFBD>P
 <EFBFBD>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\<5C>\
+
 drop table `<60>s<EFBFBD>P`;
 drop table `<60>s<EFBFBD>Q`;
 drop table `<60>s<EFBFBD>R`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,4 @@
+-- source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,4 @@
+-- source include/have_innodb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

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

@@ -1,3 +1,4 @@
+-- source include/have_innodb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

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

@@ -1,3 +1,4 @@
+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;

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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `<60>s<EFBFBD>P`;

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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- 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

@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;