Fix for

  Bug#28563 Test suite "jp" fails completely
- The main goal of this fix is to make the "jp" suite runnable in general
  and to make it more robust for use in pushbuild under build team conditions.
- It was decided to fix the remaining heavy issues within the
  architecture of this test later
  (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
  Only the test jp_trim_sjis got some significant improvements of its
  architecture (Just as proof of concept for the other tests).
- Tests suffering from
     Bug 36597 Testsuite "jp": Suspicious results for some tests
               (unexpected result sets)
  were disabled
- *.opt files were used to avoid differences on OS (Windows) because of
  case sensitive tablenames within the tests  


mysql-test/suite/jp/r/jp_alter_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_join_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_join_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_join_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_join_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_left_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_left_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_left_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_left_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_length_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_length_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_length_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_length_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_like_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_like_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_like_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_like_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_ps_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_ps_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_right_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_right_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_right_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_right_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_select_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_select_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_select_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_select_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_union_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_update_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_where_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_where_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_where_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_where_utf8.result:
  Updated results
mysql-test/suite/jp/t/jp_alter_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_join_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_join_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_join_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_join_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_left_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_left_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_left_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_left_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_length_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_length_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_length_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_length_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_like_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_like_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_like_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_like_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_ps_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_ps_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_right_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_right_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_right_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_right_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_select_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_select_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_select_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_select_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_union_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_update_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_where_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_where_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_where_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_where_utf8.test:
  Updated results
mysql-test/suite/jp/include/trim_sjis.inc:
  Auxiliary script
mysql-test/suite/jp/t/disabled.def:
  Disable tests which suffer to an unacceptable extend
      from bug 36597 Testsuite "jp": Suspicious results for some tests

226 files changed, 3078 insertions, 18861 deletions

diff --git a/mysql-test/suite/jp/include/trim_sjis.inc b/mysql-test/suite/jp/include/trim_sjis.inc
new file mode 100644
index 00000000000..fee31a515a7
--- /dev/null
+++ b/mysql-test/suite/jp/include/trim_sjis.inc
@@ -0,0 +1,70 @@
+#
+# Test TRIM() function with Japanese characters sjis encoding
+#
+
+--source include/have_sjis.inc
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+--disable_warnings
+DROP TABLE IF EXISTS `�s�P`;
+DROP TABLE IF EXISTS `�s�Q`;
+DROP TABLE IF EXISTS `�s�R`;
+--enable_warnings
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `�s�P` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `�s�Q` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `�s�R` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+
+# Nothing to trim
+INSERT INTO `�s�P` VALUES ('渦慨�');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `�s�P` VALUES ('渦慨偽');
+INSERT INTO `�s�P` VALUES ('渦慨偽�');
+INSERT INTO `�s�P` VALUES ('渦慨偽橋');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `�s�P` VALUES ('怯桶患');
+INSERT INTO `�s�P` VALUES ('橋渦慨�');
+INSERT INTO `�s�P` VALUES ('橋怯桶患');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `�s�P` VALUES ('橋怯桶患橋�');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `�s�P` VALUES ('   渦慨�   ');
+INSERT INTO `�s�Q` VALUES ('����������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('����������������������');
+INSERT INTO `�s�Q` VALUES ('   ����������   ');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('   �\�\�\�\�\   ');
+
+SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P`;
+SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P`;
+SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P`;
+SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�Q`;
+SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�Q`;
+SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�Q`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�Q`;
+SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�R`;
+SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�R`;
+SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�R`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�R`;
+
+DROP TABLE `�s�P`;
+DROP TABLE `�s�Q`;
+DROP TABLE `�s�R`;
diff --git a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result
index f970508229a..85d974df78e 100644
--- a/mysql-test/suite/jp/r/jp_alter_sjis.result
+++ b/mysql-test/suite/jp/r/jp_alter_sjis.result
@@ -31,17 +31,17 @@ NULL	崖崖�	NULL	NULL
 DESC `臼�`;
 Field	Type	Null	Key	Default	Extra
 橋	char(1)	YES	MUL	NULL	
-祁�	char(6)		PRI		
-幻�	char(1)	YES	MUL	NULL	
+祁�	char(6)	NO	PRI		
+幻�	char(1)	YES	UNI	NULL	
 更�	char(1)	YES		NULL	
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋` char(1) default NULL,
-  `祁�` char(6) NOT NULL default '',
-  `幻�` char(1) default NULL,
-  `更�` char(1) default NULL,
-  PRIMARY KEY  (`祁�`),
+  `橋` char(1) DEFAULT NULL,
+  `祁�` char(6) NOT NULL DEFAULT '',
+  `幻�` char(1) DEFAULT NULL,
+  `更�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
@@ -58,11 +58,11 @@ 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 ''
+  `祁�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
@@ -80,17 +80,17 @@ NULL	����������	NULL	NULL
 DESC `������`;
 Field	Type	Null	Key	Default	Extra
 ����	char(1)	YES	MUL	NULL	
-������	char(6)		PRI		
-������	char(1)	YES	MUL	NULL	
+������	char(6)	NO	PRI		
+������	char(1)	YES	UNI	NULL	
 ������	char(1)	YES		NULL	
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `����` char(1) default NULL,
-  `������` char(6) NOT NULL default '',
-  `������` char(1) default NULL,
-  `������` char(1) default NULL,
-  PRIMARY KEY  (`������`),
+  `����` char(1) DEFAULT NULL,
+  `������` char(6) NOT NULL DEFAULT '',
+  `������` char(1) DEFAULT NULL,
+  `������` char(1) DEFAULT NULL,
+  PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
@@ -107,11 +107,11 @@ 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 ''
+  `������` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
@@ -129,17 +129,17 @@ NULL	�\�\�\�\�\	NULL	NULL
 DESC `�\�\�\`;
 Field	Type	Null	Key	Default	Extra
 �\�\	char(1)	YES	MUL	NULL	
-�\�\�\	char(6)		PRI		
-�\�\�\	char(1)	YES	MUL	NULL	
+�\�\�\	char(6)	NO	PRI		
+�\�\�\	char(1)	YES	UNI	NULL	
 �\�\�\	char(1)	YES		NULL	
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\` char(1) default NULL,
-  `�\�\�\` char(6) NOT NULL default '',
-  `�\�\�\` char(1) default NULL,
-  `�\�\�\` char(1) default NULL,
-  PRIMARY KEY  (`�\�\�\`),
+  `�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(6) NOT NULL DEFAULT '',
+  `�\�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
@@ -156,11 +156,11 @@ 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 ''
+  `�\�\�\` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
@@ -193,17 +193,17 @@ NULL	崖崖�	NULL	NULL
 DESC `臼�`;
 Field	Type	Null	Key	Default	Extra
 橋	char(1)	YES	MUL	NULL	
-祁�	char(6)		PRI		
-幻�	char(1)	YES	MUL	NULL	
+祁�	char(6)	NO	PRI		
+幻�	char(1)	YES	UNI	NULL	
 更�	char(1)	YES		NULL	
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋` char(1) default NULL,
-  `祁�` char(6) NOT NULL default '',
-  `幻�` char(1) default NULL,
-  `更�` char(1) default NULL,
-  PRIMARY KEY  (`祁�`),
+  `橋` char(1) DEFAULT NULL,
+  `祁�` char(6) NOT NULL DEFAULT '',
+  `幻�` char(1) DEFAULT NULL,
+  `更�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -220,11 +220,11 @@ 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 ''
+  `祁�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
@@ -242,17 +242,17 @@ NULL	����������	NULL	NULL
 DESC `������`;
 Field	Type	Null	Key	Default	Extra
 ����	char(1)	YES	MUL	NULL	
-������	char(6)		PRI		
-������	char(1)	YES	MUL	NULL	
+������	char(6)	NO	PRI		
+������	char(1)	YES	UNI	NULL	
 ������	char(1)	YES		NULL	
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `����` char(1) default NULL,
-  `������` char(6) NOT NULL default '',
-  `������` char(1) default NULL,
-  `������` char(1) default NULL,
-  PRIMARY KEY  (`������`),
+  `����` char(1) DEFAULT NULL,
+  `������` char(6) NOT NULL DEFAULT '',
+  `������` char(1) DEFAULT NULL,
+  `������` char(1) DEFAULT NULL,
+  PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -269,11 +269,11 @@ 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 ''
+  `������` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
@@ -291,17 +291,17 @@ NULL	�\�\�\�\�\	NULL	NULL
 DESC `�\�\�\`;
 Field	Type	Null	Key	Default	Extra
 �\�\	char(1)	YES	MUL	NULL	
-�\�\�\	char(6)		PRI		
-�\�\�\	char(1)	YES	MUL	NULL	
+�\�\�\	char(6)	NO	PRI		
+�\�\�\	char(1)	YES	UNI	NULL	
 �\�\�\	char(1)	YES		NULL	
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\` char(1) default NULL,
-  `�\�\�\` char(6) NOT NULL default '',
-  `�\�\�\` char(1) default NULL,
-  `�\�\�\` char(1) default NULL,
-  PRIMARY KEY  (`�\�\�\`),
+  `�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(6) NOT NULL DEFAULT '',
+  `�\�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -318,11 +318,11 @@ 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 ''
+  `�\�\�\` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
@@ -330,12 +330,12 @@ DROP TABLE `������`;
 DROP TABLE `������`;
 DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
-CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
 INSERT INTO `臼�` VALUES ('臼臼�'),('臆臆�'),('崖崖�');
 INSERT INTO `������` VALUES ('����������'),('����������'),('����������');
 INSERT INTO `�\�\�\` VALUES ('�\�\�\�\�\'),('�\�\�\�\�\'),('�\�\�\�\�\');
@@ -355,20 +355,20 @@ NULL	崖崖�	NULL	NULL
 DESC `臼�`;
 Field	Type	Null	Key	Default	Extra
 橋	char(1)	YES	MUL	NULL	
-祁�	char(6)		PRI		
-幻�	char(1)	YES	MUL	NULL	
+祁�	char(6)	NO	PRI		
+幻�	char(1)	YES	UNI	NULL	
 更�	char(1)	YES		NULL	
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋` char(1) default NULL,
-  `祁�` char(6) NOT NULL default '',
-  `幻�` char(1) default NULL,
-  `更�` char(1) default NULL,
-  PRIMARY KEY  (`祁�`),
+  `橋` char(1) DEFAULT NULL,
+  `祁�` char(6) NOT NULL DEFAULT '',
+  `幻�` char(1) DEFAULT NULL,
+  `更�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `臼�` DROP INDEX `橋�`;
 ALTER TABLE `臼�` DROP PRIMARY KEY;
 ALTER TABLE `臼�` DROP INDEX `幻�`;
@@ -382,12 +382,12 @@ SELECT * FROM `臼�`;
 崖崖�
 DESC `臼�`;
 Field	Type	Null	Key	Default	Extra
-祁�	char(6)				
+祁�	char(6)	NO			
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `祁�` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `祁�` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
 ALTER TABLE `������` ADD `������` char(1);
@@ -404,20 +404,20 @@ NULL	����������	NULL	NULL
 DESC `������`;
 Field	Type	Null	Key	Default	Extra
 ����	char(1)	YES	MUL	NULL	
-������	char(6)		PRI		
-������	char(1)	YES	MUL	NULL	
+������	char(6)	NO	PRI		
+������	char(1)	YES	UNI	NULL	
 ������	char(1)	YES		NULL	
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `����` char(1) default NULL,
-  `������` char(6) NOT NULL default '',
-  `������` char(1) default NULL,
-  `������` char(1) default NULL,
-  PRIMARY KEY  (`������`),
+  `����` char(1) DEFAULT NULL,
+  `������` char(6) NOT NULL DEFAULT '',
+  `������` char(1) DEFAULT NULL,
+  `������` char(1) DEFAULT NULL,
+  PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `������` DROP INDEX `������`;
 ALTER TABLE `������` DROP PRIMARY KEY;
 ALTER TABLE `������` DROP INDEX `������`;
@@ -431,12 +431,12 @@ SELECT * FROM `������`;
 ����������
 DESC `������`;
 Field	Type	Null	Key	Default	Extra
-������	char(6)				
+������	char(6)	NO			
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
@@ -453,20 +453,20 @@ NULL	�\�\�\�\�\	NULL	NULL
 DESC `�\�\�\`;
 Field	Type	Null	Key	Default	Extra
 �\�\	char(1)	YES	MUL	NULL	
-�\�\�\	char(6)		PRI		
-�\�\�\	char(1)	YES	MUL	NULL	
+�\�\�\	char(6)	NO	PRI		
+�\�\�\	char(1)	YES	UNI	NULL	
 �\�\�\	char(1)	YES		NULL	
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\` char(1) default NULL,
-  `�\�\�\` char(6) NOT NULL default '',
-  `�\�\�\` char(1) default NULL,
-  `�\�\�\` char(1) default NULL,
-  PRIMARY KEY  (`�\�\�\`),
+  `�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(6) NOT NULL DEFAULT '',
+  `�\�\�\` char(1) DEFAULT NULL,
+  `�\�\�\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
 ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
@@ -480,165 +480,12 @@ SELECT * FROM `�\�\�\`;
 �\�\�\�\�\
 DESC `�\�\�\`;
 Field	Type	Null	Key	Default	Extra
-�\�\�\	char(6)				
+�\�\�\	char(6)	NO			
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-DROP TABLE `臼�`;
-DROP TABLE `臆�`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-INSERT INTO `臼�` VALUES ('臼臼�'),('臆臆�'),('崖崖�');
-INSERT INTO `������` VALUES ('����������'),('����������'),('����������');
-INSERT INTO `�\�\�\` VALUES ('�\�\�\�\�\'),('�\�\�\�\�\'),('�\�\�\�\�\');
-ALTER TABLE `臼�` ADD `橋�` char(1) FIRST;
-ALTER TABLE `臼�` ADD `幻�` char(1) AFTER `祁�`;
-ALTER TABLE `臼�` ADD `更�` char(1);
-ALTER TABLE `臼�` ADD INDEX (`橋�`);
-ALTER TABLE `臼�` ADD PRIMARY KEY (`祁�`);
-ALTER TABLE `臼�` CHANGE `橋�` `橋` char(1);
-ALTER TABLE `臼�` MODIFY `祁�` char(6);
-SELECT * FROM `臼�`;
-橋	祁�	幻�	更�
-NULL	臼臼�	NULL	NULL
-NULL	臆臆�	NULL	NULL
-NULL	崖崖�	NULL	NULL
-DESC `臼�`;
-Field	Type	Null	Key	Default	Extra
-橋	char(1)	YES	MUL	NULL	
-祁�	char(6)		PRI		
-幻�	char(1)	YES		NULL	
-更�	char(1)	YES		NULL	
-SHOW CREATE TABLE `臼�`;
-Table	Create Table
-臼�	CREATE TABLE `臼�` (
-  `橋` char(1) default NULL,
-  `祁�` char(6) NOT NULL default '',
-  `幻�` char(1) default NULL,
-  `更�` char(1) default NULL,
-  PRIMARY KEY  (`祁�`),
-  KEY `橋�` (`橋`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `臼�` DROP INDEX `橋�`;
-ALTER TABLE `臼�` DROP PRIMARY KEY;
-ALTER TABLE `臼�` DROP `橋`;
-ALTER TABLE `臼�` DROP `幻�`;
-ALTER TABLE `臼�` DROP `更�`;
-SELECT * FROM `臼�`;
-祁�
-臼臼�
-臆臆�
-崖崖�
-DESC `臼�`;
-Field	Type	Null	Key	Default	Extra
-祁�	char(6)				
-SHOW CREATE TABLE `臼�`;
-Table	Create Table
-臼�	CREATE TABLE `臼�` (
-  `祁�` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `������` ADD `������` char(1) FIRST;
-ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
-ALTER TABLE `������` ADD `������` char(1);
-ALTER TABLE `������` ADD INDEX (`������`);
-ALTER TABLE `������` ADD PRIMARY KEY (`������`);
-ALTER TABLE `������` CHANGE `������` `����` char(1);
-ALTER TABLE `������` MODIFY `������` char(6);
-SELECT * FROM `������`;
-����	������	������	������
-NULL	����������	NULL	NULL
-NULL	����������	NULL	NULL
-NULL	����������	NULL	NULL
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-����	char(1)	YES	MUL	NULL	
-������	char(6)		PRI		
-������	char(1)	YES		NULL	
-������	char(1)	YES		NULL	
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TABLE `������` (
-  `����` char(1) default NULL,
-  `������` char(6) NOT NULL default '',
-  `������` char(1) default NULL,
-  `������` char(1) default NULL,
-  PRIMARY KEY  (`������`),
-  KEY `������` (`����`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `������` DROP INDEX `������`;
-ALTER TABLE `������` DROP PRIMARY KEY;
-ALTER TABLE `������` DROP `����`;
-ALTER TABLE `������` DROP `������`;
-ALTER TABLE `������` DROP `������`;
-SELECT * FROM `������`;
-������
-����������
-����������
-����������
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(6)				
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TABLE `������` (
-  `������` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
-ALTER TABLE `�\�\�\` ADD INDEX (`�\�\�\`);
-ALTER TABLE `�\�\�\` ADD PRIMARY KEY (`�\�\�\`);
-ALTER TABLE `�\�\�\` CHANGE `�\�\�\` `�\�\` char(1);
-ALTER TABLE `�\�\�\` MODIFY `�\�\�\` char(6);
-SELECT * FROM `�\�\�\`;
-�\�\	�\�\�\	�\�\�\	�\�\�\
-NULL	�\�\�\�\�\	NULL	NULL
-NULL	�\�\�\�\�\	NULL	NULL
-NULL	�\�\�\�\�\	NULL	NULL
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\	char(1)	YES	MUL	NULL	
-�\�\�\	char(6)		PRI		
-�\�\�\	char(1)	YES		NULL	
-�\�\�\	char(1)	YES		NULL	
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\` char(1) default NULL,
-  `�\�\�\` char(6) NOT NULL default '',
-  `�\�\�\` char(1) default NULL,
-  `�\�\�\` char(1) default NULL,
-  PRIMARY KEY  (`�\�\�\`),
-  KEY `�\�\�\` (`�\�\`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
-ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
-ALTER TABLE `�\�\�\` DROP `�\�\`;
-ALTER TABLE `�\�\�\` DROP `�\�\�\`;
-ALTER TABLE `�\�\�\` DROP `�\�\�\`;
-SELECT * FROM `�\�\�\`;
-�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(6)				
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+  `�\�\�\` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `������`;
diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result
index 2756e5a758d..7cbd8859ac1 100644
--- a/mysql-test/suite/jp/r/jp_alter_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result
@@ -32,17 +32,17 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -59,11 +59,11 @@ 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 ''
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -81,17 +81,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -108,11 +108,11 @@ 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 ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -130,17 +130,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -157,11 +157,11 @@ 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 ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -194,17 +194,17 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -221,11 +221,11 @@ 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 ''
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -243,17 +243,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -270,11 +270,11 @@ 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 ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -292,17 +292,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -319,11 +319,11 @@ 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 ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -331,12 +331,12 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
 INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
@@ -356,20 +356,20 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -383,12 +383,12 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -405,20 +405,20 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -432,12 +432,12 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ききき` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -454,20 +454,20 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -481,165 +481,12 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST;
-ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`;
-ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1);
-ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`);
-ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`);
-ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1);
-ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6);
-SELECT * FROM `ｱｱｱ`;
-ｶｶ	ｷｷｷ	ｸｸｸ	ｹｹｹ
-NULL	ｱｱｱｱｱ	NULL	NULL
-NULL	ｲｲｲｲｲ	NULL	NULL
-NULL	ｳｳｳｳｳ	NULL	NULL
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES		NULL	
-ｹｹｹ	char(1)	YES		NULL	
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
-  KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
-ALTER TABLE `ｱｱｱ` DROP `ｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`;
-ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`;
-SELECT * FROM `ｱｱｱ`;
-ｷｷｷ
-ｱｱｱｱｱ
-ｲｲｲｲｲ
-ｳｳｳｳｳ
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-SELECT * FROM `あああ`;
-かか	ききき	くくく	けけけ
-NULL	あああああ	NULL	NULL
-NULL	いいいいい	NULL	NULL
-NULL	ううううう	NULL	NULL
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES		NULL	
-けけけ	char(1)	YES		NULL	
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
-  KEY `かかか` (`かか`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-SELECT * FROM `あああ`;
-ききき
-あああああ
-いいいいい
-ううううう
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-SELECT * FROM `龖龖龖`;
-丄丄	丂丂丂	丅丅丅	乚乚乚
-NULL	丂丂丂丂丂	NULL	NULL
-NULL	丄丄丄丄丄	NULL	NULL
-NULL	丅丅丅丅丅	NULL	NULL
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES		NULL	
-乚乚乚	char(1)	YES		NULL	
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
-  KEY `丄丄丄` (`丄丄`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-SELECT * FROM `龖龖龖`;
-丂丂丂
-丂丂丂丂丂
-丄丄丄丄丄
-丅丅丅丅丅
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
diff --git a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result
index afa3c79cbce..7e4f19342f6 100644
--- a/mysql-test/suite/jp/r/jp_alter_ujis.result
+++ b/mysql-test/suite/jp/r/jp_alter_ujis.result
@@ -31,17 +31,17 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
@@ -58,11 +58,11 @@ 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 ''
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -80,17 +80,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
@@ -107,11 +107,11 @@ 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 ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -129,17 +129,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
@@ -156,11 +156,11 @@ 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 ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -193,17 +193,17 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
@@ -220,11 +220,11 @@ 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 ''
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -242,17 +242,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
@@ -269,11 +269,11 @@ 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 ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -291,17 +291,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
@@ -318,11 +318,11 @@ 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 ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -330,12 +330,12 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
 INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
 INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
@@ -355,20 +355,20 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES	MUL	NULL	
+ｷｷｷ	char(6)	NO	PRI		
+ｸｸｸ	char(1)	YES	UNI	NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
+  `ｶｶ` char(1) DEFAULT NULL,
+  `ｷｷｷ` char(6) NOT NULL DEFAULT '',
+  `ｸｸｸ` char(1) DEFAULT NULL,
+  `ｹｹｹ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -382,12 +382,12 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｷｷｷ` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,20 +404,20 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -431,12 +431,12 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ききき` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,20 +453,20 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -480,165 +480,12 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST;
-ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`;
-ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1);
-ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`);
-ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`);
-ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1);
-ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6);
-SELECT * FROM `ｱｱｱ`;
-ｶｶ	ｷｷｷ	ｸｸｸ	ｹｹｹ
-NULL	ｱｱｱｱｱ	NULL	NULL
-NULL	ｲｲｲｲｲ	NULL	NULL
-NULL	ｳｳｳｳｳ	NULL	NULL
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
-ｸｸｸ	char(1)	YES		NULL	
-ｹｹｹ	char(1)	YES		NULL	
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶ` char(1) default NULL,
-  `ｷｷｷ` char(6) NOT NULL default '',
-  `ｸｸｸ` char(1) default NULL,
-  `ｹｹｹ` char(1) default NULL,
-  PRIMARY KEY  (`ｷｷｷ`),
-  KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
-ALTER TABLE `ｱｱｱ` DROP `ｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`;
-ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`;
-SELECT * FROM `ｱｱｱ`;
-ｷｷｷ
-ｱｱｱｱｱ
-ｲｲｲｲｲ
-ｳｳｳｳｳ
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｷｷｷ` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-SELECT * FROM `あああ`;
-かか	ききき	くくく	けけけ
-NULL	あああああ	NULL	NULL
-NULL	いいいいい	NULL	NULL
-NULL	ううううう	NULL	NULL
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES		NULL	
-けけけ	char(1)	YES		NULL	
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
-  KEY `かかか` (`かか`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-SELECT * FROM `あああ`;
-ききき
-あああああ
-いいいいい
-ううううう
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-SELECT * FROM `龖龖龖`;
-丄丄	丂丂丂	丅丅丅	乚乚乚
-NULL	丂丂丂丂丂	NULL	NULL
-NULL	丄丄丄丄丄	NULL	NULL
-NULL	丅丅丅丅丅	NULL	NULL
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES		NULL	
-乚乚乚	char(1)	YES		NULL	
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
-  KEY `丄丄丄` (`丄丄`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-SELECT * FROM `龖龖龖`;
-丂丂丂
-丂丂丂丂丂
-丄丄丄丄丄
-丅丅丅丅丅
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result
index 19475e06a87..b641e9de78d 100644
--- a/mysql-test/suite/jp/r/jp_alter_utf8.result
+++ b/mysql-test/suite/jp/r/jp_alter_utf8.result
@@ -31,17 +31,17 @@ NULL	鐔鰹蹴鐔鰹蹴鐔�	NULL	NULL
 DESC `鐔縁襲鐔�`;
 Field	Type	Null	Key	Default	Extra
 鐔駈酋	char(1)	YES	MUL	NULL	
-鐔件酬鐔�	char(6)		PRI		
-鐔醐集鐔�	char(1)	YES	MUL	NULL	
+鐔件酬鐔�	char(6)	NO	PRI		
+鐔醐集鐔�	char(1)	YES	UNI	NULL	
 鐔刻醜鐔�	char(1)	YES		NULL	
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋` char(1) default NULL,
-  `鐔件酬鐔�` char(6) NOT NULL default '',
-  `鐔醐集鐔�` char(1) default NULL,
-  `鐔刻醜鐔�` char(1) default NULL,
-  PRIMARY KEY  (`鐔件酬鐔�`),
+  `鐔駈酋` char(1) DEFAULT NULL,
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT '',
+  `鐔醐集鐔�` char(1) DEFAULT NULL,
+  `鐔刻醜鐔�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`鐔件酬鐔�`),
   UNIQUE KEY `鐔醐集鐔�` (`鐔醐集鐔�`),
   KEY `鐔駈酋鐔�` (`鐔駈酋`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -58,11 +58,11 @@ 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 ''
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
@@ -80,17 +80,17 @@ NULL	���������������	NULL	NULL
 DESC `���������`;
 Field	Type	Null	Key	Default	Extra
 ������	char(1)	YES	MUL	NULL	
-���������	char(6)		PRI		
-���������	char(1)	YES	MUL	NULL	
+���������	char(6)	NO	PRI		
+���������	char(1)	YES	UNI	NULL	
 ���������	char(1)	YES		NULL	
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `������` char(1) default NULL,
-  `���������` char(6) NOT NULL default '',
-  `���������` char(1) default NULL,
-  `���������` char(1) default NULL,
-  PRIMARY KEY  (`���������`),
+  `������` char(1) DEFAULT NULL,
+  `���������` char(6) NOT NULL DEFAULT '',
+  `���������` char(1) DEFAULT NULL,
+  `���������` char(1) DEFAULT NULL,
+  PRIMARY KEY (`���������`),
   UNIQUE KEY `���������` (`���������`),
   KEY `���������` (`������`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -107,11 +107,11 @@ 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 ''
+  `���������` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
@@ -129,17 +129,17 @@ NULL	筝�筝�筝�筝�筝�	NULL	NULL
 DESC `蘊�蘊�蘊�`;
 Field	Type	Null	Key	Default	Extra
 筝�筝�	char(1)	YES	MUL	NULL	
-筝�筝�筝�	char(6)		PRI		
-筝�筝�筝�	char(1)	YES	MUL	NULL	
+筝�筝�筝�	char(6)	NO	PRI		
+筝�筝�筝�	char(1)	YES	UNI	NULL	
 箙�箙�箙�	char(1)	YES		NULL	
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�` char(1) default NULL,
-  `筝�筝�筝�` char(6) NOT NULL default '',
-  `筝�筝�筝�` char(1) default NULL,
-  `箙�箙�箙�` char(1) default NULL,
-  PRIMARY KEY  (`筝�筝�筝�`),
+  `筝�筝�` char(1) DEFAULT NULL,
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT '',
+  `筝�筝�筝�` char(1) DEFAULT NULL,
+  `箙�箙�箙�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`筝�筝�筝�`),
   UNIQUE KEY `筝�筝�筝�` (`筝�筝�筝�`),
   KEY `筝�筝�筝�` (`筝�筝�`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -156,11 +156,11 @@ 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 ''
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
@@ -193,17 +193,17 @@ NULL	鐔鰹蹴鐔鰹蹴鐔�	NULL	NULL
 DESC `鐔縁襲鐔�`;
 Field	Type	Null	Key	Default	Extra
 鐔駈酋	char(1)	YES	MUL	NULL	
-鐔件酬鐔�	char(6)		PRI		
-鐔醐集鐔�	char(1)	YES	MUL	NULL	
+鐔件酬鐔�	char(6)	NO	PRI		
+鐔醐集鐔�	char(1)	YES	UNI	NULL	
 鐔刻醜鐔�	char(1)	YES		NULL	
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋` char(1) default NULL,
-  `鐔件酬鐔�` char(6) NOT NULL default '',
-  `鐔醐集鐔�` char(1) default NULL,
-  `鐔刻醜鐔�` char(1) default NULL,
-  PRIMARY KEY  (`鐔件酬鐔�`),
+  `鐔駈酋` char(1) DEFAULT NULL,
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT '',
+  `鐔醐集鐔�` char(1) DEFAULT NULL,
+  `鐔刻醜鐔�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`鐔件酬鐔�`),
   UNIQUE KEY `鐔醐集鐔�` (`鐔醐集鐔�`),
   KEY `鐔駈酋鐔�` (`鐔駈酋`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -220,11 +220,11 @@ 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 ''
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
@@ -242,17 +242,17 @@ NULL	���������������	NULL	NULL
 DESC `���������`;
 Field	Type	Null	Key	Default	Extra
 ������	char(1)	YES	MUL	NULL	
-���������	char(6)		PRI		
-���������	char(1)	YES	MUL	NULL	
+���������	char(6)	NO	PRI		
+���������	char(1)	YES	UNI	NULL	
 ���������	char(1)	YES		NULL	
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `������` char(1) default NULL,
-  `���������` char(6) NOT NULL default '',
-  `���������` char(1) default NULL,
-  `���������` char(1) default NULL,
-  PRIMARY KEY  (`���������`),
+  `������` char(1) DEFAULT NULL,
+  `���������` char(6) NOT NULL DEFAULT '',
+  `���������` char(1) DEFAULT NULL,
+  `���������` char(1) DEFAULT NULL,
+  PRIMARY KEY (`���������`),
   UNIQUE KEY `���������` (`���������`),
   KEY `���������` (`������`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -269,11 +269,11 @@ 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 ''
+  `���������` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
@@ -291,17 +291,17 @@ NULL	筝�筝�筝�筝�筝�	NULL	NULL
 DESC `蘊�蘊�蘊�`;
 Field	Type	Null	Key	Default	Extra
 筝�筝�	char(1)	YES	MUL	NULL	
-筝�筝�筝�	char(6)		PRI		
-筝�筝�筝�	char(1)	YES	MUL	NULL	
+筝�筝�筝�	char(6)	NO	PRI		
+筝�筝�筝�	char(1)	YES	UNI	NULL	
 箙�箙�箙�	char(1)	YES		NULL	
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�` char(1) default NULL,
-  `筝�筝�筝�` char(6) NOT NULL default '',
-  `筝�筝�筝�` char(1) default NULL,
-  `箙�箙�箙�` char(1) default NULL,
-  PRIMARY KEY  (`筝�筝�筝�`),
+  `筝�筝�` char(1) DEFAULT NULL,
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT '',
+  `筝�筝�筝�` char(1) DEFAULT NULL,
+  `箙�箙�箙�` char(1) DEFAULT NULL,
+  PRIMARY KEY (`筝�筝�筝�`),
   UNIQUE KEY `筝�筝�筝�` (`筝�筝�筝�`),
   KEY `筝�筝�筝�` (`筝�筝�`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -318,11 +318,11 @@ 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 ''
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
@@ -330,12 +330,12 @@ DROP TABLE `���������`;
 DROP TABLE `���������`;
 DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊�蘊�蘊�`;
-CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
 INSERT INTO `鐔縁襲鐔�` VALUES ('鐔縁襲鐔縁襲鐔�'),('鐔駕讐鐔駕讐鐔�'),('鐔鰹蹴鐔鰹蹴鐔�');
 INSERT INTO `���������` VALUES ('���������������'),('���������������'),('���������������');
 INSERT INTO `蘊�蘊�蘊�` VALUES ('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�');
@@ -355,20 +355,20 @@ NULL	鐔鰹蹴鐔鰹蹴鐔�	NULL	NULL
 DESC `鐔縁襲鐔�`;
 Field	Type	Null	Key	Default	Extra
 鐔駈酋	char(1)	YES	MUL	NULL	
-鐔件酬鐔�	char(6)		PRI		
-鐔醐集鐔�	char(1)	YES	MUL	NULL	
+鐔件酬鐔�	char(6)	NO	PRI		
+鐔醐集鐔�	char(1)	YES	UNI	NULL	
 鐔刻醜鐔�	char(1)	YES		NULL	
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋` char(1) default NULL,
-  `鐔件酬鐔�` char(6) NOT NULL default '',
-  `鐔醐集鐔�` char(1) default NULL,
-  `鐔刻醜鐔�` char(1) default NULL,
-  PRIMARY KEY  (`鐔件酬鐔�`),
+  `鐔駈酋` char(1) DEFAULT NULL,
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT '',
+  `鐔醐集鐔�` char(1) DEFAULT NULL,
+  `鐔刻醜鐔�` char(1) DEFAULT NULL,
+  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
+  `鐔件酬鐔�` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
 ALTER TABLE `���������` ADD `���������` char(1);
@@ -404,20 +404,20 @@ NULL	���������������	NULL	NULL
 DESC `���������`;
 Field	Type	Null	Key	Default	Extra
 ������	char(1)	YES	MUL	NULL	
-���������	char(6)		PRI		
-���������	char(1)	YES	MUL	NULL	
+���������	char(6)	NO	PRI		
+���������	char(1)	YES	UNI	NULL	
 ���������	char(1)	YES		NULL	
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `������` char(1) default NULL,
-  `���������` char(6) NOT NULL default '',
-  `���������` char(1) default NULL,
-  `���������` char(1) default NULL,
-  PRIMARY KEY  (`���������`),
+  `������` char(1) DEFAULT NULL,
+  `���������` char(6) NOT NULL DEFAULT '',
+  `���������` char(1) DEFAULT NULL,
+  `���������` char(1) DEFAULT NULL,
+  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
+  `���������` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
@@ -453,20 +453,20 @@ NULL	筝�筝�筝�筝�筝�	NULL	NULL
 DESC `蘊�蘊�蘊�`;
 Field	Type	Null	Key	Default	Extra
 筝�筝�	char(1)	YES	MUL	NULL	
-筝�筝�筝�	char(6)		PRI		
-筝�筝�筝�	char(1)	YES	MUL	NULL	
+筝�筝�筝�	char(6)	NO	PRI		
+筝�筝�筝�	char(1)	YES	UNI	NULL	
 箙�箙�箙�	char(1)	YES		NULL	
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�` char(1) default NULL,
-  `筝�筝�筝�` char(6) NOT NULL default '',
-  `筝�筝�筝�` char(1) default NULL,
-  `箙�箙�箙�` char(1) default NULL,
-  PRIMARY KEY  (`筝�筝�筝�`),
+  `筝�筝�` char(1) DEFAULT NULL,
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT '',
+  `筝�筝�筝�` char(1) DEFAULT NULL,
+  `箙�箙�箙�` char(1) DEFAULT NULL,
+  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,165 +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
-DROP TABLE `鐔縁襲鐔�`;
-DROP TABLE `鐔駕讐鐔�`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
-CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-INSERT INTO `鐔縁襲鐔�` VALUES ('鐔縁襲鐔縁襲鐔�'),('鐔駕讐鐔駕讐鐔�'),('鐔鰹蹴鐔鰹蹴鐔�');
-INSERT INTO `���������` VALUES ('���������������'),('���������������'),('���������������');
-INSERT INTO `蘊�蘊�蘊�` VALUES ('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�');
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔駈酋鐔�` char(1) FIRST;
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔醐集鐔�` char(1) AFTER `鐔件酬鐔�`;
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔刻醜鐔�` char(1);
-ALTER TABLE `鐔縁襲鐔�` ADD INDEX (`鐔駈酋鐔�`);
-ALTER TABLE `鐔縁襲鐔�` ADD PRIMARY KEY (`鐔件酬鐔�`);
-ALTER TABLE `鐔縁襲鐔�` CHANGE `鐔駈酋鐔�` `鐔駈酋` char(1);
-ALTER TABLE `鐔縁襲鐔�` MODIFY `鐔件酬鐔�` char(6);
-SELECT * FROM `鐔縁襲鐔�`;
-鐔駈酋	鐔件酬鐔�	鐔醐集鐔�	鐔刻醜鐔�
-NULL	鐔縁襲鐔縁襲鐔�	NULL	NULL
-NULL	鐔駕讐鐔駕讐鐔�	NULL	NULL
-NULL	鐔鰹蹴鐔鰹蹴鐔�	NULL	NULL
-DESC `鐔縁襲鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔駈酋	char(1)	YES	MUL	NULL	
-鐔件酬鐔�	char(6)		PRI		
-鐔醐集鐔�	char(1)	YES		NULL	
-鐔刻醜鐔�	char(1)	YES		NULL	
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-Table	Create Table
-鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋` char(1) default NULL,
-  `鐔件酬鐔�` char(6) NOT NULL default '',
-  `鐔醐集鐔�` char(1) default NULL,
-  `鐔刻醜鐔�` char(1) default NULL,
-  PRIMARY KEY  (`鐔件酬鐔�`),
-  KEY `鐔駈酋鐔�` (`鐔駈酋`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔駈酋鐔�`;
-ALTER TABLE `鐔縁襲鐔�` DROP PRIMARY KEY;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔駈酋`;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔醐集鐔�`;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔刻醜鐔�`;
-SELECT * FROM `鐔縁襲鐔�`;
-鐔件酬鐔�
-鐔縁襲鐔縁襲鐔�
-鐔駕讐鐔駕讐鐔�
-鐔鰹蹴鐔鰹蹴鐔�
-DESC `鐔縁襲鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔件酬鐔�	char(6)				
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-Table	Create Table
-鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔件酬鐔�` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `���������` ADD `���������` char(1) FIRST;
-ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
-ALTER TABLE `���������` ADD `���������` char(1);
-ALTER TABLE `���������` ADD INDEX (`���������`);
-ALTER TABLE `���������` ADD PRIMARY KEY (`���������`);
-ALTER TABLE `���������` CHANGE `���������` `������` char(1);
-ALTER TABLE `���������` MODIFY `���������` char(6);
-SELECT * FROM `���������`;
-������	���������	���������	���������
-NULL	���������������	NULL	NULL
-NULL	���������������	NULL	NULL
-NULL	���������������	NULL	NULL
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES	MUL	NULL	
-���������	char(6)		PRI		
-���������	char(1)	YES		NULL	
-���������	char(1)	YES		NULL	
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TABLE `���������` (
-  `������` char(1) default NULL,
-  `���������` char(6) NOT NULL default '',
-  `���������` char(1) default NULL,
-  `���������` char(1) default NULL,
-  PRIMARY KEY  (`���������`),
-  KEY `���������` (`������`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `���������` DROP INDEX `���������`;
-ALTER TABLE `���������` DROP PRIMARY KEY;
-ALTER TABLE `���������` DROP `������`;
-ALTER TABLE `���������` DROP `���������`;
-ALTER TABLE `���������` DROP `���������`;
-SELECT * FROM `���������`;
-���������
-���������������
-���������������
-���������������
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(6)				
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TABLE `���������` (
-  `���������` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
-ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
-ALTER TABLE `蘊�蘊�蘊�` ADD INDEX (`筝�筝�筝�`);
-ALTER TABLE `蘊�蘊�蘊�` ADD PRIMARY KEY (`筝�筝�筝�`);
-ALTER TABLE `蘊�蘊�蘊�` CHANGE `筝�筝�筝�` `筝�筝�` char(1);
-ALTER TABLE `蘊�蘊�蘊�` MODIFY `筝�筝�筝�` char(6);
-SELECT * FROM `蘊�蘊�蘊�`;
-筝�筝�	筝�筝�筝�	筝�筝�筝�	箙�箙�箙�
-NULL	筝�筝�筝�筝�筝�	NULL	NULL
-NULL	筝�筝�筝�筝�筝�	NULL	NULL
-NULL	筝�筝�筝�筝�筝�	NULL	NULL
-DESC `蘊�蘊�蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�	char(1)	YES	MUL	NULL	
-筝�筝�筝�	char(6)		PRI		
-筝�筝�筝�	char(1)	YES		NULL	
-箙�箙�箙�	char(1)	YES		NULL	
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-Table	Create Table
-蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�` char(1) default NULL,
-  `筝�筝�筝�` char(6) NOT NULL default '',
-  `筝�筝�筝�` char(1) default NULL,
-  `箙�箙�箙�` char(1) default NULL,
-  PRIMARY KEY  (`筝�筝�筝�`),
-  KEY `筝�筝�筝�` (`筝�筝�`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP PRIMARY KEY;
-ALTER TABLE `蘊�蘊�蘊�` DROP `筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP `箙�箙�箙�`;
-SELECT * FROM `蘊�蘊�蘊�`;
-筝�筝�筝�
-筝�筝�筝�筝�筝�
-筝�筝�筝�筝�筝�
-筝�筝�筝�筝�筝�
-DESC `蘊�蘊�蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(6)				
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-Table	Create Table
-蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `���������`;
diff --git a/mysql-test/suite/jp/r/jp_charlength_sjis.result b/mysql-test/suite/jp/r/jp_charlength_sjis.result
index 57d538ef8d0..5c734b4b8cf 100644
--- a/mysql-test/suite/jp/r/jp_charlength_sjis.result
+++ b/mysql-test/suite/jp/r/jp_charlength_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P`;
 �b�P	CHAR_LENGTH(`�b�P`)
 	0
@@ -108,30 +99,6 @@ SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�X`;
 �\�\	2
 �\	1
 	0
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�O`;
-�b�P	CHAR_LENGTH(`�b�P`)
-渦慨�	5
-渦慨	4
-渦�	3
-渦	2
-�	1
-	0
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�P`;
-�b�P	CHAR_LENGTH(`�b�P`)
-����������	5
-��������	4
-������	3
-����	2
-��	1
-	0
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�Q`;
-�b�P	CHAR_LENGTH(`�b�P`)
-�\�\�\�\�\	5
-�\�\�\�\	4
-�\�\�\	3
-�\�\	2
-�\	1
-	0
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -141,6 +108,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_charlength_ucs2.result b/mysql-test/suite/jp/r/jp_charlength_ucs2.result
index 3695ee5159a..b211c87c420 100644
--- a/mysql-test/suite/jp/r/jp_charlength_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_charlength_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -109,30 +100,6 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
 龔龖	2
 龔	1
 	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
-龔	1
-	0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -142,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_charlength_ujis.result b/mysql-test/suite/jp/r/jp_charlength_ujis.result
index ccfbf4fa3a1..910952b482f 100644
--- a/mysql-test/suite/jp/r/jp_charlength_ujis.result
+++ b/mysql-test/suite/jp/r/jp_charlength_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
 龔龖	2
 龔	1
 	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
-龔	1
-	0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_charlength_utf8.result b/mysql-test/suite/jp/r/jp_charlength_utf8.result
index d4d7f68f933..473eb9870c6 100644
--- a/mysql-test/suite/jp/r/jp_charlength_utf8.result
+++ b/mysql-test/suite/jp/r/jp_charlength_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 鐚ｏ��	CHAR_LENGTH(`鐚ｏ��`)
 	0
@@ -108,30 +99,6 @@ SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 蘊�蘊�	2
 蘊�	1
 	0
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	CHAR_LENGTH(`鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	5
-鐔縁讐鐔鰹輯	4
-鐔縁讐鐔�	3
-鐔縁讐	2
-鐔�	1
-	0
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	CHAR_LENGTH(`鐚ｏ��`)
-���������������	5
-������������	4
-���������	3
-������	2
-���	1
-	0
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	CHAR_LENGTH(`鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	5
-蘊�蘊�蘊�蘊�	4
-蘊�蘊�蘊�	3
-蘊�蘊�	2
-蘊�	1
-	0
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -141,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_charset_sjis.result b/mysql-test/suite/jp/r/jp_charset_sjis.result
index 80ef24a7334..049f872cfa1 100644
--- a/mysql-test/suite/jp/r/jp_charset_sjis.result
+++ b/mysql-test/suite/jp/r/jp_charset_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P`;
 CHARSET(`�b�P`)
 sjis
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�X`;
 CHARSET(CONVERT(`�b�P` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�O`;
-CHARSET(`�b�P`)
-sjis
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�P`;
-CHARSET(`�b�P`)
-sjis
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�Q`;
-CHARSET(`�b�P`)
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�O`;
-CHARSET(CONVERT(`�b�P` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�O`;
-CHARSET(CONVERT(`�b�P` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�O`;
-CHARSET(CONVERT(`�b�P` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�O`;
-CHARSET(CONVERT(`�b�P` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�P`;
-CHARSET(CONVERT(`�b�P` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�P`;
-CHARSET(CONVERT(`�b�P` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�P`;
-CHARSET(CONVERT(`�b�P` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�P`;
-CHARSET(CONVERT(`�b�P` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�Q`;
-CHARSET(CONVERT(`�b�P` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�Q`;
-CHARSET(CONVERT(`�b�P` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�Q`;
-CHARSET(CONVERT(`�b�P` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�Q`;
-CHARSET(CONVERT(`�b�P` USING ujis))
-ujis
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -225,6 +171,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_charset_ucs2.result b/mysql-test/suite/jp/r/jp_charset_ucs2.result
index d121e98fc00..c5aee82c3c5 100644
--- a/mysql-test/suite/jp/r/jp_charset_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_charset_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -90,28 +84,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 CHARSET(`Ｃ１`)
 ucs2
@@ -247,51 +219,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 CHARSET(CONVERT(`Ｃ１` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -301,6 +228,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result
index 964477896bd..746b53ee5e1 100644
--- a/mysql-test/suite/jp/r/jp_charset_ujis.result
+++ b/mysql-test/suite/jp/r/jp_charset_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 CHARSET(`Ｃ１`)
 ujis
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 CHARSET(CONVERT(`Ｃ１` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-CHARSET(`Ｃ１`)
-ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-CHARSET(`Ｃ１`)
-ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-CHARSET(`Ｃ１`)
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -225,6 +171,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_charset_utf8.result b/mysql-test/suite/jp/r/jp_charset_utf8.result
index 2fdd3fb1a6b..9f22bda74f0 100644
--- a/mysql-test/suite/jp/r/jp_charset_utf8.result
+++ b/mysql-test/suite/jp/r/jp_charset_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = innodb
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��`;
 CHARSET(`鐚ｏ��`)
 utf8
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��`;
 CHARSET(CONVERT(`鐚ｏ��` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-CHARSET(`鐚ｏ��`)
-utf8
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-CHARSET(`鐚ｏ��`)
-utf8
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-CHARSET(`鐚ｏ��`)
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-CHARSET(CONVERT(`鐚ｏ��` USING ujis))
-ujis
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -225,6 +171,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_convert_sjis.result b/mysql-test/suite/jp/r/jp_convert_sjis.result
index 8c9df3606c8..abb0c28f4f6 100644
--- a/mysql-test/suite/jp/r/jp_convert_sjis.result
+++ b/mysql-test/suite/jp/r/jp_convert_sjis.result
@@ -9,21 +9,15 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 CREATE TABLE `�s�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P`;
 �b�P	CONVERT(`�b�P` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -783,255 +774,6 @@ SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�X`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�X`;
 �b�P	CONVERT(`�b�P` using ujis)
 �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�O`;
-�b�P	CONVERT(`�b�P` using utf8)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[�_]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 、�ぅΗ┤������	 、�ぅΗ┤������
-葦桶患況弦沙悉梢	葦桶患況弦沙悉梢
-請唾津毒班碧麺力	請唾津毒班碧麺力
-佰厶壞嶐慵无槿渤	佰厶壞嶐慵无槿渤
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�O`;
-�b�P	CONVERT(`�b�P` using ucs2)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[�_]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 、�ぅΗ┤������	 、�ぅΗ┤������
-葦桶患況弦沙悉梢	葦桶患況弦沙悉梢
-請唾津毒班碧麺力	請唾津毒班碧麺力
-佰厶壞嶐慵无槿渤	佰厶壞嶐慵无槿渤
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�O`;
-�b�P	CONVERT(`�b�P` using ujis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[�_]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 、�ぅΗ┤������	 、�ぅΗ┤������
-葦桶患況弦沙悉梢	葦桶患況弦沙悉梢
-請唾津毒班碧麺力	請唾津毒班碧麺力
-佰厶壞嶐慵无槿渤	佰厶壞嶐慵无槿渤
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�P`;
-�b�P	CONVERT(`�b�P` using utf8)
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�]�}�~��������������������������������	�{�]�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�����������������������������E�E�E�E�E	�E�����������������������������E�E�E�E�E
-�E�E�E�E�E�E�����������������E�E�E�E�E�E	�E�E�E�E�E�E�����������������E�E�E�E�E�E
-�E�E���������������E�E�E�E�E�E�E�E�E�E�E	�E�E���������������E�E�E�E�E�E�E�E�E�E�E
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�E�����������������E�E�E�E���E�E�E�E�@	�E�E�����������������E�E�E�E���E�E�E�E�@
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R
-�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f	�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E
-�E�E�E�E�E������������������������������	�E�E�E�E�E������������������������������
-�����������������������E�E�E�E�E�E�E�E�E	�����������������������E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-���������������E�E�E�E�E�E�E�E�E�E�E�E�E	���������������E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-�����������E�E�E�E�E�E�E�E��������������	�����������E�E�E�E�E�E�E�E��������������
-�����������������������������������E�E�E	�����������������������������������E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z	�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-���������������������������E�E�E�E�E�E�E	���������������������������E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E	�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E	�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�P`;
-�b�P	CONVERT(`�b�P` using ucs2)
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�]�}�~��������������������������������	�{�]�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�����������������������������E�E�E�E�E	�E�����������������������������E�E�E�E�E
-�E�E�E�E�E�E�����������������E�E�E�E�E�E	�E�E�E�E�E�E�����������������E�E�E�E�E�E
-�E�E���������������E�E�E�E�E�E�E�E�E�E�E	�E�E���������������E�E�E�E�E�E�E�E�E�E�E
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�E�����������������E�E�E�E���E�E�E�E�@	�E�E�����������������E�E�E�E���E�E�E�E�@
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R
-�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f	�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E
-�E�E�E�E�E������������������������������	�E�E�E�E�E������������������������������
-�����������������������E�E�E�E�E�E�E�E�E	�����������������������E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-���������������E�E�E�E�E�E�E�E�E�E�E�E�E	���������������E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-�����������E�E�E�E�E�E�E�E��������������	�����������E�E�E�E�E�E�E�E��������������
-�����������������������������������E�E�E	�����������������������������������E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z	�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-���������������������������E�E�E�E�E�E�E	���������������������������E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E	�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E	�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�P`;
-�b�P	CONVERT(`�b�P` using ujis)
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�]�}�~��������������������������������	�{�]�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�����������������������������E�E�E�E�E	�E�����������������������������E�E�E�E�E
-�E�E�E�E�E�E�����������������E�E�E�E�E�E	�E�E�E�E�E�E�����������������E�E�E�E�E�E
-�E�E���������������E�E�E�E�E�E�E�E�E�E�E	�E�E���������������E�E�E�E�E�E�E�E�E�E�E
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�E�����������������E�E�E�E���E�E�E�E�@	�E�E�����������������E�E�E�E���E�E�E�E�@
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R
-�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f	�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E
-�E�E�E�E�E������������������������������	�E�E�E�E�E������������������������������
-�����������������������E�E�E�E�E�E�E�E�E	�����������������������E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-���������������E�E�E�E�E�E�E�E�E�E�E�E�E	���������������E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-�����������E�E�E�E�E�E�E�E��������������	�����������E�E�E�E�E�E�E�E��������������
-�����������������������������������E�E�E	�����������������������������������E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z	�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-���������������������������E�E�E�E�E�E�E	���������������������������E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E	�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������	�E��������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-����������������������������������������	����������������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R	�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f	�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z	�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������	�{�|�}�~��������������������������������
-�������������������������������E�E�E�E�E	�������������������������������E�E�E�E�E
-�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E	�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E	�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�Q`;
-�b�P	CONVERT(`�b�P` using utf8)
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�Q`;
-�b�P	CONVERT(`�b�P` using ucs2)
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�Q`;
-�b�P	CONVERT(`�b�P` using ujis)
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -1041,6 +783,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
index 92c2032993e..5d5b0761ad8 100644
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -91,28 +85,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
  ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
@@ -338,81 +310,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`;
 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・???????????????????
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	????????????????????
 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
-ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
-ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
-ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚~΄΅・・・・・・・・¡¦¿・・・
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚~΄΅・・・・・・・・¡¦¿・・・
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・??~??・・・・・・・・???・・・
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	????????????????????
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	????????????????????
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	????????????????????
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・???????????????????
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	????????????????????
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -422,6 +319,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result
index 55f2ab0aea3..314a9e95086 100644
--- a/mysql-test/suite/jp/r/jp_convert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_convert_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1134,372 +1125,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`;
 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
 龔龖龗龞龡龢龣龥・・・・・・・・・・・・	????????・・・・・・・・・・・・
 ・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ	 ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ	ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ	ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ	ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ	　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥	＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・	＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　	・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-・・・・・・・・・・・・・・・・０１２３	・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ	４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・	ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ	・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・	ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ	　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥	＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・	＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　	・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-・・・・・・・・・・・・・・・・０１２３	・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ	４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・	ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ	・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・	ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ	　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’	ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】	“”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥	＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・	＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　	・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-・・・・・・・・・・・・・・・・０１２３	・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ	４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・	ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ	・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・	ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using utf8)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚~΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・	¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・	łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・	ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using ucs2)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚~΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・	¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・	łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・	ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`;
-Ｃ１	CONVERT(`Ｃ１` using sjis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・?????
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・??~??・・・・・・・・???・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・?????
-¤№・・・・・・・・・・・・・・・・・・	??・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・?????・?・??・?・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・????????????・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・??????
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	???????・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・?????????????・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・??・?・?・??・???・??・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・???????
-łŀʼnŋøœßŧþ・・・・・・・・・・・	?????????・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・???????????????????
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	?????・??????????????
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	????????????????????
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	????????????????????
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・???????????????????
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	????????・???????・???
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	????????????????????
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	????????????????????
-ǖŵýÿŷźžż・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・???????????????????
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	????????????????????
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	????????????????????
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	????????????????????
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	???????????????・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・???????????????????
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	????????????????????
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -1509,6 +1134,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index 505d6c1cebf..5a47d5d687a 100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��`;
 鐚ｏ��	CONVERT(`鐚ｏ��` using ujis)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1134,372 +1125,6 @@ SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��`;
 藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�	????????????????????
 蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	????????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
 ��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ujis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�	 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎	鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ucs2)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�	 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎	鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using sjis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�	 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎	鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�	鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ujis)
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��	������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-��障��������篁������������錫�����鐚�鐚若�����鐔������モ�����	��障��������篁������������錫�����鐚�?������鐔������モ�����
-������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������	������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������
-鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�	鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�
-鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��	鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��
-��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��	��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��
-��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��	�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��	��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�
-鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�	鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�
-鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��	鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��
-��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�	��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��	鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��
-��祉��������������������������������������������������������	��祉��������������������������������������������������������
-�����������������������������������������＜�≪�ｃ�ゃ�ャ�����	�����������������������������������������＜�≪�ｃ�ゃ�ャ�����
-��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��	��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��
-��若�純�障�帥�����������������������������������������������	��若�純�障�帥�����������������������������������������������
-��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��	��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��
-��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������	��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������
-������������������������������������������������������������	������������������������������������������������������������
-�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������	�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������
-��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��士�������������������������������痢裡里	��士�������������������������������痢裡里
-離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�	離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�
-慮旅虜了亮僚両凌��������������������祉�祉��	慮旅虜了亮僚両凌��������������������祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��姉�����������������������������������弌	��姉�����������������������������������弌
-丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��	丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶	��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶
-从仍仄仆仂仗����������������������������	从仍仄仆仂仗����������������������������
-�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��獅�������������������������も�癌�錫�������������������ｂ��	��獅�������������������������も�癌�錫�������������������ｂ��
-�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��	�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�	��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�
-罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����	罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����
-�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����	�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����
-腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���	腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���
-腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��	腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��
-��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�	��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�
-��∝�主�������乗��������藝�胼������画��������荅掩��莖�������	��∝�主�������乗��������藝�胼������画��������荅掩��莖�������
-���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��	���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�	��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�
-篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��	篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��
-篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�	篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�
-篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������	篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������
-�����������������������������後����������翫�蚊�祉�祉�祉�祉��	�����������������������������後����������翫�蚊�祉�祉�祉�祉��
-��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�	��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�
-藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�	藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�
-藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�	藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�
-藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�	藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�
-藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��	藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��
-��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ucs2)
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��	������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-��障��������篁������������錫�����鐚�鐚若�����鐔������モ�����	��障��������篁������������錫�����鐚�鐚若�����鐔������モ�����
-������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������	������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������
-鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�	鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�
-鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��	鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��
-��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��	��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��
-��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��	�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��	��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�
-鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�	鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�
-鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��	鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��
-��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�	��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��	鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��
-��祉��������������������������������������������������������	��祉��������������������������������������������������������
-�����������������������������������������＜�≪�ｃ�ゃ�ャ�����	�����������������������������������������＜�≪�ｃ�ゃ�ャ�����
-��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��	��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��
-��若�純�障�帥�����������������������������������������������	��若�純�障�帥�����������������������������������������������
-��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��	��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��
-��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������	��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������
-������������������������������������������������������������	������������������������������������������������������������
-�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������	�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������
-��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��士�������������������������������痢裡里	��士�������������������������������痢裡里
-離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�	離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�
-慮旅虜了亮僚両凌��������������������祉�祉��	慮旅虜了亮僚両凌��������������������祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��姉�����������������������������������弌	��姉�����������������������������������弌
-丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��	丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶	��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶
-从仍仄仆仂仗����������������������������	从仍仄仆仂仗����������������������������
-�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��獅�������������������������も�癌�錫�������������������ｂ��	��獅�������������������������も�癌�錫�������������������ｂ��
-�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��	�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�	��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�
-罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����	罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����
-�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����	�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����
-腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���	腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���
-腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��	腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��
-��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�	��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�
-��∝�主�������乗��������藝�胼������画��������荅掩��莖�������	��∝�主�������乗��������藝�胼������画��������荅掩��莖�������
-���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��	���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�	��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�
-篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��	篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��
-篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�	篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�
-篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������	篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������
-�����������������������������後����������翫�蚊�祉�祉�祉�祉��	�����������������������������後����������翫�蚊�祉�祉�祉�祉��
-��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�	��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�
-藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�	藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�
-藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�	藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�
-藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�	藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�
-藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��	藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��
-��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using sjis)
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��	������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-��障��������篁������������錫�����鐚�鐚若�����鐔������モ�����	��障��������篁������������錫�����鐚�?������鐔������モ�����
-������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������	������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������
-鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�	鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�
-鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��	鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��
-��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��	��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��
-��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��	�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��	��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�
-鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�	鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�
-鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��	鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��
-��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�	��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��	鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��
-��祉��������������������������������������������������������	��祉��������������������������������������������������������
-�����������������������������������������＜�≪�ｃ�ゃ�ャ�����	�����������������������������������������＜�≪�ｃ�ゃ�ャ�����
-��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��	��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��
-��若�純�障�帥�����������������������������������������������	��若�純�障�帥�����������������������������������������������
-��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��	��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��
-��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������	��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������
-������������������������������������������������������������	������������������������������������������������������������
-�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������	�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������
-��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��士�������������������������������痢裡里	��士�������������������������������痢裡里
-離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�	離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�
-慮旅虜了亮僚両凌��������������������祉�祉��	慮旅虜了亮僚両凌��������������������祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��姉�����������������������������������弌	��姉�����������������������������������弌
-丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��	丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶	��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶
-从仍仄仆仂仗����������������������������	从仍仄仆仂仗����������������������������
-�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��獅�������������������������も�癌�錫�������������������ｂ��	��獅�������������������������も�癌�錫�������������������ｂ��
-�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��	�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�	��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�
-罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����	罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����
-�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����	�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����
-腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���	腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���
-腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��	腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��
-��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�	��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�
-��∝�主�������乗��������藝�胼������画��������荅掩��莖�������	��∝�主�������乗��������藝�胼������画��������荅掩��莖�������
-���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��	���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�	��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�
-篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��	篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��
-篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�	篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�
-篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������	篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������
-�����������������������������後����������翫�蚊�祉�祉�祉�祉��	�����������������������������後����������翫�蚊�祉�祉�祉�祉��
-��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�	��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�
-藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�	藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�
-藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�	藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�
-藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�	藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�
-藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��	藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��
-��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ujis)
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����
-��史���鐔�������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��	��史���?������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���
-造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��	��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��
-��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��	��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������
-�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�姿���������������������������祉�祉�祉�祉��	��祉�姿���������������������������祉�祉�祉�祉��
-��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��	��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚
-��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫������������������������������ﾃ�����	��暫������������������������������ﾃ�����
-������������残���帳��弔�������ﾇ棵暢町懲	������������残���帳��弔�������ﾇ棵暢町懲
-調超長捗鳥������������������������������	調超長捗鳥������������������������������
-��������鼎鄭��������適��徹的轍溺敵������	��������鼎鄭��������適��徹的轍溺敵������
-��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫｜�辰但���ﾄ���奪達������巽���枎竪谷	��暫｜�辰但���ﾄ���奪達������巽���枎竪谷
-棚��������乃������残…ッ�狸誰樽����残�眺挑	棚��������乃������残…ッ�狸誰樽����残�眺挑
-諜跳頂直勅������単坦嘆旦担������探������	諜跳頂直勅������単坦嘆旦担������探������
-����邸��泥釘炭湛端短鏑��撤笛迭哲滴������	����邸��泥釘炭湛端短鏑��撤笛迭哲滴������
-��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�	��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�
-箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�	箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�
-篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�	篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�
-篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�	篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�
-篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��	篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��
-��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�	��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�	藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�	藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using ucs2)
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����
-��史���鐔�������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��	��史���鐔�������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���
-造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��	��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��
-��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��	��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������
-�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�姿���������������������������祉�祉�祉�祉��	��祉�姿���������������������������祉�祉�祉�祉��
-��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��	��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚
-��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫������������������������������ﾃ�����	��暫������������������������������ﾃ�����
-������������残���帳��弔�������ﾇ棵暢町懲	������������残���帳��弔�������ﾇ棵暢町懲
-調超長捗鳥������������������������������	調超長捗鳥������������������������������
-��������鼎鄭��������適��徹的轍溺敵������	��������鼎鄭��������適��徹的轍溺敵������
-��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫｜�辰但���ﾄ���奪達������巽���枎竪谷	��暫｜�辰但���ﾄ���奪達������巽���枎竪谷
-棚��������乃������残…ッ�狸誰樽����残�眺挑	棚��������乃������残…ッ�狸誰樽����残�眺挑
-諜跳頂直勅������単坦嘆旦担������探������	諜跳頂直勅������単坦嘆旦担������探������
-����邸��泥釘炭湛端短鏑��撤笛迭哲滴������	����邸��泥釘炭湛端短鏑��撤笛迭哲滴������
-��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�	��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�
-箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�	箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�
-篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�	篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�
-篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�	篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�
-篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��	篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��
-��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�	��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�	藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�	藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-鐚ｏ��	CONVERT(`鐚ｏ��` using sjis)
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��?????
-��史���鐔�������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��	���?????��祉�祉�祉�祉�祉�祉�祉��???��祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��?????
-造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	??��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��	��祉�祉�祉�祉��?????���?���??���?��祉�祉��
-��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��	���????????????��祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��??????
-�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	???????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�姿���������������������������祉�祉�祉�祉��	��祉��?????????????��祉�祉�祉�祉��
-��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��	���??���?���?���??���???���??��祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��???????
-��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	?????????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫������������������������������ﾃ�����	���???????????????????
-������������残���帳��弔�������ﾇ棵暢町懲	?????���??????????????
-調超長捗鳥������������������������������	????????????????????
-��������鼎鄭��������適��徹的轍溺敵������	????????????????????
-��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	????????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫｜�辰但���ﾄ���奪達������巽���枎竪谷	���???????????????????
-棚��������乃������残…ッ�狸誰樽����残�眺挑	????????���???????���???
-諜跳頂直勅������単坦嘆旦担������探������	????????????????????
-����邸��泥釘炭湛端短鏑��撤笛迭哲滴������	????????????????????
-��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	????????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�	���???????????????????
-箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�	????????????????????
-篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�	????????????????????
-篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�	????????????????????
-篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��	???????????????��祉�祉�祉�祉��
-��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�	���???????????????????
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�	????????????????????
-藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�	????????????????????
-蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	????????��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��	��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -1509,6 +1134,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result
index 1ce0b7228d5..2534e958931 100644
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result
@@ -8,11 +8,12 @@ CREATE DATABASE `���{��`;
 CREATE DATABASE `�\�\�\`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 �\�\�\
 ���{��
 椴欹�
+mysql
+test
 USE `椴欹�`;
 USE `���{��`;
 USE `�\�\�\`;
diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
index 8fd921ea8e6..4ba1b7b47b9 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
@@ -9,11 +9,12 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `龔龖龗`;
diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result
index 45fdb34717b..b3beebbd917 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result
@@ -8,11 +8,12 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `龔龖龗`;
diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result
index c0e996040de..0e1725a9c86 100644
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result
@@ -8,11 +8,12 @@ CREATE DATABASE `��ユ��茯�`;
 CREATE DATABASE `蘊�蘊�蘊�`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 ��ユ��茯�
 蘊�蘊�蘊�
 鐓�鐓�鐓�鐔削��
+mysql
+test
 USE `鐓�鐓�鐓�鐔削��`;
 USE `��ユ��茯�`;
 USE `蘊�蘊�蘊�`;
diff --git a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
index ecc72f9d91b..b3a5a52f0d1 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
@@ -22,11 +22,23 @@ CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '臼�' already exists
 CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '臆�' already exists
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '������' already exists
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '������' already exists
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
 CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=INNODB;
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋�` char(1) default NULL
+  `橋�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
-  `祁�` char(1) default NULL
+  `祁�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
-  `幻�` char(1) default NULL
+  `幻�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
-  `更�` char(1) default NULL
+  `更�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
-  `査�` char(1) default NULL
+  `査�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
@@ -178,11 +190,23 @@ CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '臼�' already exists
 CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '臆�' already exists
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '������' already exists
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '������' already exists
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
 CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=MyISAM;
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋�` char(1) default NULL
+  `橋�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
-  `祁�` char(1) default NULL
+  `祁�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
-  `幻�` char(1) default NULL
+  `幻�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
-  `更�` char(1) default NULL
+  `更�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
-  `査�` char(1) default NULL
+  `査�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
+  `������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
+  `�\�\�\` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
@@ -327,27 +351,39 @@ DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
-CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '臼�' already exists
+CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '臆�' already exists
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '������' already exists
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '������' already exists
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+Warnings:
+Note	1050	Table '�\�\�\' already exists
+CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
 DESC `臼�`;
 Field	Type	Null	Key	Default	Extra
 橋�	char(1)	YES		NULL	
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
-  `橋�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `橋�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
-  `祁�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `祁�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
-  `幻�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `幻�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
-  `更�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `更�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
-  `査�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `査�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `�\�\�\` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `�\�\�\` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `�\�\�\` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `�\�\�\` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-DROP TABLE `臼�`;
-DROP TABLE `臆�`;
-DROP TABLE `崖�`;
-DROP TABLE `幹�`;
-DROP TABLE `亀�`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-DESC `臼�`;
-Field	Type	Null	Key	Default	Extra
-橋�	char(1)	YES		NULL	
-DESC `臆�`;
-Field	Type	Null	Key	Default	Extra
-祁�	char(1)	YES		NULL	
-DESC `崖�`;
-Field	Type	Null	Key	Default	Extra
-幻�	char(1)	YES		NULL	
-DESC `幹�`;
-Field	Type	Null	Key	Default	Extra
-更�	char(1)	YES		NULL	
-DESC `亀�`;
-Field	Type	Null	Key	Default	Extra
-査�	char(1)	YES		NULL	
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES		NULL	
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES		NULL	
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES		NULL	
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES		NULL	
-DESC `������`;
-Field	Type	Null	Key	Default	Extra
-������	char(1)	YES		NULL	
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(1)	YES		NULL	
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(1)	YES		NULL	
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(1)	YES		NULL	
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(1)	YES		NULL	
-DESC `�\�\�\`;
-Field	Type	Null	Key	Default	Extra
-�\�\�\	char(1)	YES		NULL	
-SHOW CREATE TABLE `臼�`;
-Table	Create Table
-臼�	CREATE TABLE `臼�` (
-  `橋�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `臆�`;
-Table	Create Table
-臆�	CREATE TABLE `臆�` (
-  `祁�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `崖�`;
-Table	Create Table
-崖�	CREATE TABLE `崖�` (
-  `幻�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `幹�`;
-Table	Create Table
-幹�	CREATE TEMPORARY TABLE `幹�` (
-  `更�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `亀�`;
-Table	Create Table
-亀�	CREATE TEMPORARY TABLE `亀�` (
-  `査�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `������`;
-Table	Create Table
-������	CREATE TEMPORARY TABLE `������` (
-  `������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�\�\�\`;
-Table	Create Table
-�\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
-  `�\�\�\` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+  `�\�\�\` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `崖�`;
diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
index 0bf5a6891b0..5ca3d84465e 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
@@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=INNODB;
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
+  `ｶｶｶ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
+  `ｷｷｷ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
+  `ｸｸｸ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
+  `ｹｹｹ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
+  `ｺｺｺ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM;
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
+  `ｶｶｶ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
+  `ｷｷｷ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
+  `ｸｸｸ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
+  `ｹｹｹ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
+  `ｺｺｺ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -327,27 +351,39 @@ DROP TABLE `龗龗龗`;
 DROP TABLE `龞龞龞`;
 DROP TABLE `龡龡龡`;
 DROP TABLE `龢龢龢`;
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table 'あああ' already exists
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table 'いいい' already exists
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶｶ	char(1)	YES		NULL	
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｶｶｶ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｷｷｷ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｸｸｸ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｹｹｹ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ｺｺｺ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `かかか` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `ききき` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `くくく` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `けけけ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `こここ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `丂丂丂` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `丄丄丄` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `丅丅丅` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `丌丌丌` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `ｳｳｳ`;
-DROP TABLE `ｴｴｴ`;
-DROP TABLE `ｵｵｵ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `ううう`;
-DROP TABLE `えええ`;
-DROP TABLE `おおお`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-DROP TABLE `龞龞龞`;
-DROP TABLE `龡龡龡`;
-DROP TABLE `龢龢龢`;
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｶｶｶ	char(1)	YES		NULL	
-DESC `ｲｲｲ`;
-Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(1)	YES		NULL	
-DESC `ｳｳｳ`;
-Field	Type	Null	Key	Default	Extra
-ｸｸｸ	char(1)	YES		NULL	
-DESC `ｴｴｴ`;
-Field	Type	Null	Key	Default	Extra
-ｹｹｹ	char(1)	YES		NULL	
-DESC `ｵｵｵ`;
-Field	Type	Null	Key	Default	Extra
-ｺｺｺ	char(1)	YES		NULL	
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かかか	char(1)	YES		NULL	
-DESC `いいい`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(1)	YES		NULL	
-DESC `ううう`;
-Field	Type	Null	Key	Default	Extra
-くくく	char(1)	YES		NULL	
-DESC `えええ`;
-Field	Type	Null	Key	Default	Extra
-けけけ	char(1)	YES		NULL	
-DESC `おおお`;
-Field	Type	Null	Key	Default	Extra
-こここ	char(1)	YES		NULL	
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(1)	YES		NULL	
-DESC `龗龗龗`;
-Field	Type	Null	Key	Default	Extra
-丄丄丄	char(1)	YES		NULL	
-DESC `龞龞龞`;
-Field	Type	Null	Key	Default	Extra
-丅丅丅	char(1)	YES		NULL	
-DESC `龡龡龡`;
-Field	Type	Null	Key	Default	Extra
-丌丌丌	char(1)	YES		NULL	
-DESC `龢龢龢`;
-Field	Type	Null	Key	Default	Extra
-丒丒丒	char(1)	YES		NULL	
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `ｲｲｲ`;
-Table	Create Table
-ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `ｳｳｳ`;
-Table	Create Table
-ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `ｴｴｴ`;
-Table	Create Table
-ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `ｵｵｵ`;
-Table	Create Table
-ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `いいい`;
-Table	Create Table
-いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `ううう`;
-Table	Create Table
-ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `えええ`;
-Table	Create Table
-えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `おおお`;
-Table	Create Table
-おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `龗龗龗`;
-Table	Create Table
-龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `龞龞龞`;
-Table	Create Table
-龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `龡龡龡`;
-Table	Create Table
-龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `龢龢龢`;
-Table	Create Table
-龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+  `丒丒丒` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
index ae555e5af15..f79e131ec5f 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
@@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=INNODB;
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
+  `ｶｶｶ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
+  `ｷｷｷ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
+  `ｸｸｸ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
+  `ｹｹｹ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
+  `ｺｺｺ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=MyISAM;
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
+  `ｶｶｶ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
+  `ｷｷｷ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
+  `ｸｸｸ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
+  `ｹｹｹ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
+  `ｺｺｺ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
@@ -327,27 +351,39 @@ DROP TABLE `龗龗龗`;
 DROP TABLE `龞龞龞`;
 DROP TABLE `龡龡龡`;
 DROP TABLE `龢龢龢`;
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table 'あああ' already exists
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table 'いいい' already exists
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶｶ	char(1)	YES		NULL	
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｶｶｶ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｷｷｷ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｸｸｸ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｹｹｹ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ｺｺｺ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `かかか` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `ききき` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `くくく` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `けけけ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `こここ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `丂丂丂` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `丄丄丄` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `丅丅丅` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+  `丌丌丌` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `ｳｳｳ`;
-DROP TABLE `ｴｴｴ`;
-DROP TABLE `ｵｵｵ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `ううう`;
-DROP TABLE `えええ`;
-DROP TABLE `おおお`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-DROP TABLE `龞龞龞`;
-DROP TABLE `龡龡龡`;
-DROP TABLE `龢龢龢`;
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-DESC `ｱｱｱ`;
-Field	Type	Null	Key	Default	Extra
-ｶｶｶ	char(1)	YES		NULL	
-DESC `ｲｲｲ`;
-Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(1)	YES		NULL	
-DESC `ｳｳｳ`;
-Field	Type	Null	Key	Default	Extra
-ｸｸｸ	char(1)	YES		NULL	
-DESC `ｴｴｴ`;
-Field	Type	Null	Key	Default	Extra
-ｹｹｹ	char(1)	YES		NULL	
-DESC `ｵｵｵ`;
-Field	Type	Null	Key	Default	Extra
-ｺｺｺ	char(1)	YES		NULL	
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かかか	char(1)	YES		NULL	
-DESC `いいい`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(1)	YES		NULL	
-DESC `ううう`;
-Field	Type	Null	Key	Default	Extra
-くくく	char(1)	YES		NULL	
-DESC `えええ`;
-Field	Type	Null	Key	Default	Extra
-けけけ	char(1)	YES		NULL	
-DESC `おおお`;
-Field	Type	Null	Key	Default	Extra
-こここ	char(1)	YES		NULL	
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(1)	YES		NULL	
-DESC `龗龗龗`;
-Field	Type	Null	Key	Default	Extra
-丄丄丄	char(1)	YES		NULL	
-DESC `龞龞龞`;
-Field	Type	Null	Key	Default	Extra
-丅丅丅	char(1)	YES		NULL	
-DESC `龡龡龡`;
-Field	Type	Null	Key	Default	Extra
-丌丌丌	char(1)	YES		NULL	
-DESC `龢龢龢`;
-Field	Type	Null	Key	Default	Extra
-丒丒丒	char(1)	YES		NULL	
-SHOW CREATE TABLE `ｱｱｱ`;
-Table	Create Table
-ｱｱｱ	CREATE TABLE `ｱｱｱ` (
-  `ｶｶｶ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `ｲｲｲ`;
-Table	Create Table
-ｲｲｲ	CREATE TABLE `ｲｲｲ` (
-  `ｷｷｷ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `ｳｳｳ`;
-Table	Create Table
-ｳｳｳ	CREATE TABLE `ｳｳｳ` (
-  `ｸｸｸ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `ｴｴｴ`;
-Table	Create Table
-ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
-  `ｹｹｹ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `ｵｵｵ`;
-Table	Create Table
-ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
-  `ｺｺｺ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `いいい`;
-Table	Create Table
-いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `ううう`;
-Table	Create Table
-ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `えええ`;
-Table	Create Table
-えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `おおお`;
-Table	Create Table
-おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `龗龗龗`;
-Table	Create Table
-龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `龞龞龞`;
-Table	Create Table
-龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `龡龡龡`;
-Table	Create Table
-龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `龢龢龢`;
-Table	Create Table
-龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+  `丒丒丒` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
diff --git a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
index d4873406c46..5dc64d2df5c 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+++ b/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;
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋鐔�` char(1) default NULL
+  `鐔駈酋鐔�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
-  `鐔件酬鐔�` char(1) default NULL
+  `鐔件酬鐔�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
-  `鐔醐集鐔�` char(1) default NULL
+  `鐔醐集鐔�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
-  `鐔刻醜鐔�` char(1) default NULL
+  `鐔刻醜鐔�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
-  `鐔削什鐔�` char(1) default NULL
+  `鐔削什鐔�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
@@ -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;
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋鐔�` char(1) default NULL
+  `鐔駈酋鐔�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
-  `鐔件酬鐔�` char(1) default NULL
+  `鐔件酬鐔�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
-  `鐔醐集鐔�` char(1) default NULL
+  `鐔醐集鐔�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
-  `鐔刻醜鐔�` char(1) default NULL
+  `鐔刻醜鐔�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
-  `鐔削什鐔�` char(1) default NULL
+  `鐔削什鐔�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
+  `���������` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
-  `筝�筝�筝�` char(1) default NULL
+  `筝�筝�筝�` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
@@ -327,27 +351,39 @@ DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊♂勝蘊�`;
 DROP TABLE `蘊∫匠蘊�`;
-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 `���������`(`���������` 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;
-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;
-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;
-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 TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鐔縁襲鐔�`(`鐔駈酋鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `鐔駕讐鐔�`(`鐔件酬鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `鐔縁襲鐔�`(`鐔駈酋鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '鐔縁襲鐔�' already exists
+CREATE TABLE IF NOT EXISTS `鐔駕讐鐔�`(`鐔件酬鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '鐔駕讐鐔�' already exists
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '���������' already exists
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '���������' already exists
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '蘊�蘊�蘊�' already exists
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '蘊�蘊�蘊�' already exists
+CREATE TABLE IF NOT EXISTS `鐔鰹蹴鐔�`(`鐔醐集鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�`char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
 DESC `鐔縁襲鐔�`;
 Field	Type	Null	Key	Default	Extra
 鐔駈酋鐔�	char(1)	YES		NULL	
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋鐔�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `鐔駈酋鐔�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
-  `鐔件酬鐔�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `鐔件酬鐔�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
-  `鐔醐集鐔�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `鐔醐集鐔�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
-  `鐔刻醜鐔�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `鐔刻醜鐔�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
-  `鐔削什鐔�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `鐔削什鐔�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `���������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `���������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `���������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `���������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `���������` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-DROP TABLE `鐔縁襲鐔�`;
-DROP TABLE `鐔駕讐鐔�`;
-DROP TABLE `鐔鰹蹴鐔�`;
-DROP TABLE `鐔器輯鐔�`;
-DROP TABLE `鐔居週鐔�`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊♂勝蘊�`;
-DROP TABLE `蘊∫匠蘊�`;
-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 `���������`(`���������` 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;
-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;
-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;
-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 TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-DESC `鐔縁襲鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔駈酋鐔�	char(1)	YES		NULL	
-DESC `鐔駕讐鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔件酬鐔�	char(1)	YES		NULL	
-DESC `鐔鰹蹴鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔醐集鐔�	char(1)	YES		NULL	
-DESC `鐔器輯鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔刻醜鐔�	char(1)	YES		NULL	
-DESC `鐔居週鐔�`;
-Field	Type	Null	Key	Default	Extra
-鐔削什鐔�	char(1)	YES		NULL	
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(1)	YES		NULL	
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(1)	YES		NULL	
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(1)	YES		NULL	
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(1)	YES		NULL	
-DESC `���������`;
-Field	Type	Null	Key	Default	Extra
-���������	char(1)	YES		NULL	
-DESC `蘊�蘊�蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(1)	YES		NULL	
-DESC `蘊�蘊�蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(1)	YES		NULL	
-DESC `蘊�蘊�蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(1)	YES		NULL	
-DESC `蘊♂勝蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(1)	YES		NULL	
-DESC `蘊∫匠蘊�`;
-Field	Type	Null	Key	Default	Extra
-筝�筝�筝�	char(1)	YES		NULL	
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-Table	Create Table
-鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
-  `鐔駈酋鐔�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐔駕讐鐔�`;
-Table	Create Table
-鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
-  `鐔件酬鐔�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐔鰹蹴鐔�`;
-Table	Create Table
-鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
-  `鐔醐集鐔�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐔器輯鐔�`;
-Table	Create Table
-鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
-  `鐔刻醜鐔�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐔居週鐔�`;
-Table	Create Table
-鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
-  `鐔削什鐔�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `���������`;
-Table	Create Table
-���������	CREATE TEMPORARY TABLE `���������` (
-  `���������` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-Table	Create Table
-蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-Table	Create Table
-蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-Table	Create Table
-蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `蘊♂勝蘊�`;
-Table	Create Table
-蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `蘊∫匠蘊�`;
-Table	Create Table
-蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
-  `筝�筝�筝�` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+  `筝�筝�筝�` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `鐔鰹蹴鐔�`;
diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result
index 1e46dbffbb1..cc68c1536a0 100644
--- a/mysql-test/suite/jp/r/jp_enum_sjis.result
+++ b/mysql-test/suite/jp/r/jp_enum_sjis.result
@@ -7,9 +7,7 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
+drop table if exists t1;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +16,9 @@ CREATE TABLE `�s�R` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET
 CREATE TABLE `�s�S` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�Q` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�R` VALUES ('�\'),('�\'),('�\');
@@ -33,9 +28,6 @@ INSERT INTO `�s�U` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�V` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�W` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�X` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�O` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�P` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Q` VALUES ('�\'),('�\'),('�\');
 SELECT * FROM `�s�P`;
 �b�P
 �
@@ -81,93 +73,60 @@ SELECT * FROM `�s�X`;
 �\
 �\
 �\
-SELECT * FROM `�s�P�O`;
-�b�P
-�
-�
-�
-SELECT * FROM `�s�P�P`;
-�b�P
-��
-��
-��
-SELECT * FROM `�s�P�Q`;
-�b�P
-�\
-�\
-�\
 SHOW CREATE TABLE `�s�P`;
 Table	Create Table
 �s�P	CREATE TABLE `�s�P` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
-  `�b�P` enum('�\','�\','�\') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�O`;
-Table	Create Table
-�s�P�O	CREATE TABLE `�s�P�O` (
-  `�b�P` enum('�','�','�') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�P`;
-Table	Create Table
-�s�P�P	CREATE TABLE `�s�P�P` (
-  `�b�P` enum('��','��','��') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�Q`;
-Table	Create Table
-�s�P�Q	CREATE TABLE `�s�P�Q` (
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DESC `�s�P`;
 Field	Type	Null	Key	Default	Extra
 �b�P	enum('�','�','�')	YES	MUL	NULL	
@@ -195,15 +154,6 @@ Field	Type	Null	Key	Default	Extra
 DESC `�s�X`;
 Field	Type	Null	Key	Default	Extra
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
-DESC `�s�P�O`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('�','�','�')	YES	MUL	NULL	
-DESC `�s�P�P`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('��','��','��')	YES	MUL	NULL	
-DESC `�s�P�Q`;
-Field	Type	Null	Key	Default	Extra
-�b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 ALTER TABLE `�s�P` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�Q` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�R` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
@@ -213,140 +163,110 @@ ALTER TABLE `�s�U` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�V` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�W` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�X` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�O` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�P` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�Q` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `�s�P`;
 Table	Create Table
 �s�P	CREATE TABLE `�s�P` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�O`;
-Table	Create Table
-�s�P�O	CREATE TABLE `�s�P�O` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�','�','�') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�P`;
-Table	Create Table
-�s�P�P	CREATE TABLE `�s�P�P` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('��','��','��') default NULL,
-  KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-SHOW CREATE TABLE `�s�P�Q`;
-Table	Create Table
-�s�P�Q	CREATE TABLE `�s�P�Q` (
-  `�b�Q` char(1) NOT NULL default '',
-  `�b�P` enum('�\','�\','�\') default NULL,
+  `�b�Q` char(1) NOT NULL,
+  `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
+CREATE TABLE t1(c1 enum('�S','�s')) default character set = sjis;
+INSERT INTO t1 VALUES('�S'),('�s');
+SELECT * FROM t1 WHERE c1 LIKE '�S';
+c1
+�S
+DROP TABLE t1;
 DESC `�s�P`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�Q`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�R`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DESC `�s�S`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�T`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�U`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DESC `�s�V`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�','�','�')	YES	MUL	NULL	
 DESC `�s�W`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('��','��','��')	YES	MUL	NULL	
 DESC `�s�X`;
 Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('�\','�\','�\')	YES	MUL	NULL	
-DESC `�s�P�O`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('�','�','�')	YES	MUL	NULL	
-DESC `�s�P�P`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
-�b�P	enum('��','��','��')	YES	MUL	NULL	
-DESC `�s�P�Q`;
-Field	Type	Null	Key	Default	Extra
-�b�Q	char(1)				
+�b�Q	char(1)	NO		NULL	
 �b�P	enum('�\','�\','�\')	YES	MUL	NULL	
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
@@ -357,6 +277,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result
index a84cace35fe..cb0726cd623 100644
--- a/mysql-test/suite/jp/r/jp_enum_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHAR
 CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ３` VALUES ('龔'),('龖'),('龗');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
-INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
-INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
 SELECT * FROM `Ｔ１`;
 Ｃ１
 ｱ
@@ -82,93 +73,60 @@ SELECT * FROM `Ｔ９`;
 龔
 龖
 龗
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｱ
-ｲ
-ｳ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-あ
-い
-う
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-龔
-龖
-龗
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `Ｔ１０`;
-Table	Create Table
-Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `Ｔ１１`;
-Table	Create Table
-Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-SHOW CREATE TABLE `Ｔ１２`;
-Table	Create Table
-Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
@@ -196,14 +154,113 @@ Field	Type	Null	Key	Default	Extra
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
-DESC `Ｔ１０`;
+ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ４` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ５` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+SHOW CREATE TABLE `Ｔ１`;
+Table	Create Table
+Ｔ１	CREATE TABLE `Ｔ１` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ２`;
+Table	Create Table
+Ｔ２	CREATE TABLE `Ｔ２` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ３`;
+Table	Create Table
+Ｔ３	CREATE TABLE `Ｔ３` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ４`;
+Table	Create Table
+Ｔ４	CREATE TABLE `Ｔ４` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ５`;
+Table	Create Table
+Ｔ５	CREATE TABLE `Ｔ５` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ６`;
+Table	Create Table
+Ｔ６	CREATE TABLE `Ｔ６` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ７`;
+Table	Create Table
+Ｔ７	CREATE TABLE `Ｔ７` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ８`;
+Table	Create Table
+Ｔ８	CREATE TABLE `Ｔ８` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+SHOW CREATE TABLE `Ｔ９`;
+Table	Create Table
+Ｔ９	CREATE TABLE `Ｔ９` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
-DESC `Ｔ１１`;
+DESC `Ｔ２`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ３`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DESC `Ｔ４`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ５`;
 Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
-DESC `Ｔ１２`;
+DESC `Ｔ６`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
+DESC `Ｔ７`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
+DESC `Ｔ８`;
+Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
+Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
+DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
@@ -214,6 +271,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result
index dbc850b1368..217c7e0e655 100644
--- a/mysql-test/suite/jp/r/jp_enum_ujis.result
+++ b/mysql-test/suite/jp/r/jp_enum_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHAR
 CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ３` VALUES ('龔'),('龖'),('龗');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
-INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
-INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
 SELECT * FROM `Ｔ１`;
 Ｃ１
 ｱ
@@ -81,93 +72,60 @@ SELECT * FROM `Ｔ９`;
 龔
 龖
 龗
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｱ
-ｲ
-ｳ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-あ
-い
-う
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-龔
-龖
-龗
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１０`;
-Table	Create Table
-Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１１`;
-Table	Create Table
-Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ１` enum('あ','い','う') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１２`;
-Table	Create Table
-Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
@@ -195,15 +153,6 @@ Field	Type	Null	Key	Default	Extra
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
-DESC `Ｔ１０`;
-Field	Type	Null	Key	Default	Extra
-Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
-DESC `Ｔ１１`;
-Field	Type	Null	Key	Default	Extra
-Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
-DESC `Ｔ１２`;
-Field	Type	Null	Key	Default	Extra
-Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
@@ -213,140 +162,104 @@ ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('あ','い','う') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('龔','龖','龗') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１０`;
-Table	Create Table
-Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１１`;
-Table	Create Table
-Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('あ','い','う') default NULL,
-  KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-SHOW CREATE TABLE `Ｔ１２`;
-Table	Create Table
-Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
-  `Ｃ１` enum('龔','龖','龗') default NULL,
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ２`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ３`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ４`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ５`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ６`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `Ｔ７`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
 DESC `Ｔ８`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
+Ｃ２	char(1)	NO		NULL	
 Ｃ１	enum('あ','い','う')	YES	MUL	NULL	
 DESC `Ｔ９`;
 Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
-Ｃ１	enum('龔','龖','龗')	YES	MUL	NULL	
-DESC `Ｔ１０`;
-Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
-Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
-DESC `Ｔ１１`;
-Field	Type	Null	Key	Default	Extra
-Ｃ２	char(1)				
-Ｃ１	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 `Ｔ２`;
@@ -357,6 +270,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
index f2515871ece..861aef0462d 100644
--- a/mysql-test/suite/jp/r/jp_enum_utf8.result
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAUL
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��` VALUES ('蘊�'),('蘊�'),('蘊�');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�'),('蘊�'),('蘊�');
 SELECT * FROM `鐚器��`;
 鐚ｏ��
 鐔�
@@ -81,93 +72,60 @@ SELECT * FROM `鐚器��`;
 蘊�
 蘊�
 蘊�
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-鐔�
-鐔�
-鐔�
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-���
-���
-���
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-蘊�
-蘊�
-蘊�
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('���','���','���') default NULL,
+  `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('���','���','���') default NULL,
+  `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` 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,
+  `鐚ｏ��` 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
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
-  KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` enum('���','���','���') default NULL,
-  KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DESC `鐚器��`;
 Field	Type	Null	Key	Default	Extra
 鐚ｏ��	enum('鐔�','鐔�','鐔�')	YES	MUL	NULL	
@@ -195,15 +153,6 @@ Field	Type	Null	Key	Default	Extra
 DESC `鐚器��`;
 Field	Type	Null	Key	Default	Extra
 鐚ｏ��	enum('蘊�','蘊�','蘊�')	YES	MUL	NULL	
-DESC `鐚器��鐚�`;
-Field	Type	Null	Key	Default	Extra
-鐚ｏ��	enum('鐔�','鐔�','鐔�')	YES	MUL	NULL	
-DESC `鐚器��鐚�`;
-Field	Type	Null	Key	Default	Extra
-鐚ｏ��	enum('���','���','���')	YES	MUL	NULL	
-DESC `鐚器��鐚�`;
-Field	Type	Null	Key	Default	Extra
-鐚ｏ��	enum('蘊�','蘊�','蘊�')	YES	MUL	NULL	
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
@@ -213,140 +162,104 @@ ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
-  `鐚ｏ��` char(1) NOT NULL default '',
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('���','���','���') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('���','���','���') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('���','���','���') default NULL,
+  `鐚ｏ��` 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 '',
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
-  KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` char(1) NOT NULL default '',
-  `鐚ｏ��` enum('鐔�','鐔�','鐔�') default NULL,
-  KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` char(1) NOT NULL default '',
-  `鐚ｏ��` enum('���','���','���') default NULL,
-  KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `鐚器��鐚�`;
-Table	Create Table
-鐚器��鐚�	CREATE TABLE `鐚器��鐚�` (
-  `鐚ｏ��` char(1) NOT NULL default '',
-  `鐚ｏ��` enum('蘊�','蘊�','蘊�') default NULL,
+  `鐚ｏ��` char(1) NOT NULL,
+  `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY 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)				
-鐚ｏ��	enum('蘊�','蘊�','蘊�')	YES	MUL	NULL	
-DESC `鐚器��鐚�`;
-Field	Type	Null	Key	Default	Extra
-鐚ｏ��	char(1)				
-鐚ｏ��	enum('鐔�','鐔�','鐔�')	YES	MUL	NULL	
-DESC `鐚器��鐚�`;
-Field	Type	Null	Key	Default	Extra
-鐚ｏ��	char(1)				
-鐚ｏ��	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 `鐚器��`;
@@ -357,6 +270,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_insert_sjis.result b/mysql-test/suite/jp/r/jp_insert_sjis.result
index c516986a256..53b1cdc692b 100644
--- a/mysql-test/suite/jp/r/jp_insert_sjis.result
+++ b/mysql-test/suite/jp/r/jp_insert_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 SELECT INSERT(`�b�P`,1,1,'�') FROM `�s�P`;
 INSERT(`�b�P`,1,1,'�')
 恐慨�
@@ -711,186 +702,6 @@ INSERT(`�b�P`,4,2,'�\�\' )
 SELECT INSERT(`�b�P`,5,1,'�\') FROM `�s�X`;
 INSERT(`�b�P`,5,1,'�\')
 �\�\�\�\�\
-SELECT INSERT(`�b�P`,1,1,'�') FROM `�s�P�O`;
-INSERT(`�b�P`,1,1,'�')
-恐慨�
-SELECT INSERT(`�b�P`,1,2,'況') FROM `�s�P�O`;
-INSERT(`�b�P`,1,2,'況')
-況慨�
-SELECT INSERT(`�b�P`,1,3,'況�') FROM `�s�P�O`;
-INSERT(`�b�P`,1,3,'況�')
-況鹸�
-SELECT INSERT(`�b�P`,1,4,'況弦') FROM `�s�P�O`;
-INSERT(`�b�P`,1,4,'況弦')
-況弦�
-SELECT INSERT(`�b�P`,1,5,'況弦�') FROM `�s�P�O`;
-INSERT(`�b�P`,1,5,'況弦�')
-況弦�
-SELECT INSERT(`�b�P`,2,1,'�') FROM `�s�P�O`;
-INSERT(`�b�P`,2,1,'�')
-鰻慨�
-SELECT INSERT(`�b�P`,2,2,'係') FROM `�s�P�O`;
-INSERT(`�b�P`,2,2,'係')
-鰻鹸�
-SELECT INSERT(`�b�P`,2,3,'係�') FROM `�s�P�O`;
-INSERT(`�b�P`,2,3,'係�')
-鰻弦�
-SELECT INSERT(`�b�P`,2,4,'係杭') FROM `�s�P�O`;
-INSERT(`�b�P`,2,4,'係杭')
-鰻弦�
-SELECT INSERT(`�b�P`,3,1,'�') FROM `�s�P�O`;
-INSERT(`�b�P`,3,1,'�')
-渦鹸�
-SELECT INSERT(`�b�P`,3,2,'弦') FROM `�s�P�O`;
-INSERT(`�b�P`,3,2,'弦')
-渦弦�
-SELECT INSERT(`�b�P`,3,3,'弦�') FROM `�s�P�O`;
-INSERT(`�b�P`,3,3,'弦�')
-渦弦�
-SELECT INSERT(`�b�P`,4,1,'�') FROM `�s�P�O`;
-INSERT(`�b�P`,4,1,'�')
-渦街�
-SELECT INSERT(`�b�P`,4,2,'杭') FROM `�s�P�O`;
-INSERT(`�b�P`,4,2,'杭')
-渦街�
-SELECT INSERT(`�b�P`,5,1,'�') FROM `�s�P�O`;
-INSERT(`�b�P`,5,1,'�')
-渦慨�
-SELECT INSERT(`�b�P`,1,1,'��') FROM `�s�P�P`;
-INSERT(`�b�P`,1,1,'��')
-����������
-SELECT INSERT(`�b�P`,1,2,'����') FROM `�s�P�P`;
-INSERT(`�b�P`,1,2,'����')
-����������
-SELECT INSERT(`�b�P`,1,3,'������') FROM `�s�P�P`;
-INSERT(`�b�P`,1,3,'������')
-����������
-SELECT INSERT(`�b�P`,1,4,'��������') FROM `�s�P�P`;
-INSERT(`�b�P`,1,4,'��������')
-����������
-SELECT INSERT(`�b�P`,1,5,'����������') FROM `�s�P�P`;
-INSERT(`�b�P`,1,5,'����������')
-����������
-SELECT INSERT(`�b�P`,2,1,'��') FROM `�s�P�P`;
-INSERT(`�b�P`,2,1,'��')
-����������
-SELECT INSERT(`�b�P`,2,2,'����') FROM `�s�P�P`;
-INSERT(`�b�P`,2,2,'����')
-����������
-SELECT INSERT(`�b�P`,2,3,'������') FROM `�s�P�P`;
-INSERT(`�b�P`,2,3,'������')
-����������
-SELECT INSERT(`�b�P`,2,4,'��������') FROM `�s�P�P`;
-INSERT(`�b�P`,2,4,'��������')
-����������
-SELECT INSERT(`�b�P`,3,1,'��') FROM `�s�P�P`;
-INSERT(`�b�P`,3,1,'��')
-����������
-SELECT INSERT(`�b�P`,3,2,'����') FROM `�s�P�P`;
-INSERT(`�b�P`,3,2,'����')
-����������
-SELECT INSERT(`�b�P`,3,3,'������') FROM `�s�P�P`;
-INSERT(`�b�P`,3,3,'������')
-����������
-SELECT INSERT(`�b�P`,4,1,'��') FROM `�s�P�P`;
-INSERT(`�b�P`,4,1,'��')
-����������
-SELECT INSERT(`�b�P`,4,2,'����') FROM `�s�P�P`;
-INSERT(`�b�P`,4,2,'����')
-����������
-SELECT INSERT(`�b�P`,5,1,'��') FROM `�s�P�P`;
-INSERT(`�b�P`,5,1,'��')
-����������
-SELECT INSERT(`�b�P`,1,1,'�@') FROM `�s�P�P`;
-INSERT(`�b�P`,1,1,'�@')
-�@��������
-SELECT INSERT(`�b�P`,1,2,'�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,1,2,'�@�@')
-�@�@������
-SELECT INSERT(`�b�P`,1,3,'�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,1,3,'�@�@�@')
-�@�@�@����
-SELECT INSERT(`�b�P`,1,4,'�@�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,1,4,'�@�@�@�@')
-�@�@�@�@��
-SELECT INSERT(`�b�P`,1,5,'�@�@�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,1,5,'�@�@�@�@�@')
-�@�@�@�@�@
-SELECT INSERT(`�b�P`,2,1,'�@') FROM `�s�P�P`;
-INSERT(`�b�P`,2,1,'�@')
-���@������
-SELECT INSERT(`�b�P`,2,2,'�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,2,2,'�@�@')
-���@�@����
-SELECT INSERT(`�b�P`,2,3,'�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,2,3,'�@�@�@')
-���@�@�@��
-SELECT INSERT(`�b�P`,2,4,'�@�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,2,4,'�@�@�@�@')
-���@�@�@�@
-SELECT INSERT(`�b�P`,3,1,'�@') FROM `�s�P�P`;
-INSERT(`�b�P`,3,1,'�@')
-�����@����
-SELECT INSERT(`�b�P`,3,2,'�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,3,2,'�@�@')
-�����@�@��
-SELECT INSERT(`�b�P`,3,3,'�@�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,3,3,'�@�@�@')
-�����@�@�@
-SELECT INSERT(`�b�P`,4,1,'�@') FROM `�s�P�P`;
-INSERT(`�b�P`,4,1,'�@')
-�������@��
-SELECT INSERT(`�b�P`,4,2,'�@�@') FROM `�s�P�P`;
-INSERT(`�b�P`,4,2,'�@�@')
-�������@�@
-SELECT INSERT(`�b�P`,5,1,'�@') FROM `�s�P�P`;
-INSERT(`�b�P`,5,1,'�@')
-���������@
-SELECT INSERT(`�b�P`,1,1,'�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,1,1,'�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,1,2,'�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,1,2,'�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,1,3,'�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,1,3,'�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,1,4,'�\�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,1,4,'�\�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,1,5,'�\�\�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,1,5,'�\�\�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,2,1,'�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,2,1,'�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,2,2,'�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,2,2,'�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,2,3,'�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,2,3,'�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,2,4,'�\�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,2,4,'�\�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,3,1,'�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,3,1,'�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,3,2,'�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,3,2,'�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,3,3,'�\�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,3,3,'�\�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,4,1,'�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,4,1,'�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,4,2,'�\�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,4,2,'�\�\')
-�\�\�\�\�\
-SELECT INSERT(`�b�P`,5,1,'�\') FROM `�s�P�Q`;
-INSERT(`�b�P`,5,1,'�\')
-�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -900,6 +711,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_insert_ucs2.result b/mysql-test/suite/jp/r/jp_insert_ucs2.result
index 45487f65138..e382f38515c 100644
--- a/mysql-test/suite/jp/r/jp_insert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_insert_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
 INSERT(`Ｃ１`,1,1,'ｶ')
 ｶｲｳｴｵ
@@ -712,186 +703,6 @@ INSERT(`Ｃ１`,4,2,'丂丂' )
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`;
 INSERT(`Ｃ１`,5,1,'丂')
 龔龖龗龞丂
-SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,1,'ｶ')
-ｶｲｳｴｵ
-SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,2,'ｶｶ')
-ｶｶｳｴｵ
-SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,3,'ｶｶｶ')
-ｶｶｶｴｵ
-SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,4,'ｶｶｶｶ')
-ｶｶｶｶｵ
-SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ')
-ｶｶｶｶｶ
-SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,1,'ｶ')
-ｱｶｳｴｵ
-SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,2,'ｶｶ')
-ｱｶｶｴｵ
-SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,3,'ｶｶｶ')
-ｱｶｶｶｵ
-SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,4,'ｶｶｶｶ')
-ｱｶｶｶｶ
-SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,1,'ｶ')
-ｱｲｶｴｵ
-SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,2,'ｶｶ')
-ｱｲｶｶｵ
-SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,3,'ｶｶｶ')
-ｱｲｶｶｶ
-SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,1,'ｶ')
-ｱｲｳｶｵ
-SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,2,'ｶｶ')
-ｱｲｳｶｶ
-SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,5,1,'ｶ')
-ｱｲｳｴｶ
-SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,'か')
-かいうえお
-SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,'かか')
-かかうえお
-SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,'かかか')
-かかかえお
-SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,'かかかか')
-かかかかお
-SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,'かかかかか')
-かかかかか
-SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,'か')
-あかうえお
-SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,'かか')
-あかかえお
-SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,'かかか')
-あかかかお
-SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,'かかかか')
-あかかかか
-SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,'か')
-あいかえお
-SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,'かか')
-あいかかお
-SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,'かかか')
-あいかかか
-SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,'か')
-あいうかお
-SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,'かか')
-あいうかか
-SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,'か')
-あいうえか
-SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,'　')
-　いうえお
-SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,'　　')
-　　うえお
-SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,'　　　')
-　　　えお
-SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,'　　　　')
-　　　　お
-SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,'　　　　　')
-　　　　　
-SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,'　')
-あ　うえお
-SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,'　　')
-あ　　えお
-SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,'　　　')
-あ　　　お
-SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,'　　　　')
-あ　　　　
-SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,'　')
-あい　えお
-SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,'　　')
-あい　　お
-SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,'　　　')
-あい　　　
-SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,'　')
-あいう　お
-SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,'　　')
-あいう　　
-SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,'　')
-あいうえ　
-SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,1,'丂')
-丂龖龗龞龡
-SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,2,'丂丂')
-丂丂龗龞龡
-SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,3,'丂丂丂')
-丂丂丂龞龡
-SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,4,'丂丂丂丂')
-丂丂丂丂龡
-SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,5,'丂丂丂丂丂')
-丂丂丂丂丂
-SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,1,'丂')
-龔丂龗龞龡
-SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,2,'丂丂')
-龔丂丂龞龡
-SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,3,'丂丂丂')
-龔丂丂丂龡
-SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,4,'丂丂丂丂')
-龔丂丂丂丂
-SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,1,'丂')
-龔龖丂龞龡
-SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,2,'丂丂')
-龔龖丂丂龡
-SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,3,'丂丂丂')
-龔龖丂丂丂
-SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,1,'丂')
-龔龖龗丂龡
-SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,2,'丂丂')
-龔龖龗丂丂
-SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,5,1,'丂')
-龔龖龗龞丂
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -901,6 +712,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_insert_ujis.result b/mysql-test/suite/jp/r/jp_insert_ujis.result
index 7f42d66c565..905769863f4 100644
--- a/mysql-test/suite/jp/r/jp_insert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_insert_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 SET collation_connection = ujis_japanese_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
 INSERT(`Ｃ１`,1,1,'ｶ')
 ｶｲｳｴｵ
@@ -712,186 +703,6 @@ INSERT(`Ｃ１`,4,2,'丂丂' )
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`;
 INSERT(`Ｃ１`,5,1,'丂')
 龔龖龗龞丂
-SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,1,'ｶ')
-ｶｲｳｴｵ
-SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,2,'ｶｶ')
-ｶｶｳｴｵ
-SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,3,'ｶｶｶ')
-ｶｶｶｴｵ
-SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,4,'ｶｶｶｶ')
-ｶｶｶｶｵ
-SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ')
-ｶｶｶｶｶ
-SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,1,'ｶ')
-ｱｶｳｴｵ
-SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,2,'ｶｶ')
-ｱｶｶｴｵ
-SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,3,'ｶｶｶ')
-ｱｶｶｶｵ
-SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,4,'ｶｶｶｶ')
-ｱｶｶｶｶ
-SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,1,'ｶ')
-ｱｲｶｴｵ
-SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,2,'ｶｶ')
-ｱｲｶｶｵ
-SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,3,'ｶｶｶ')
-ｱｲｶｶｶ
-SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,1,'ｶ')
-ｱｲｳｶｵ
-SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,2,'ｶｶ')
-ｱｲｳｶｶ
-SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,5,1,'ｶ')
-ｱｲｳｴｶ
-SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,'か')
-かいうえお
-SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,'かか')
-かかうえお
-SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,'かかか')
-かかかえお
-SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,'かかかか')
-かかかかお
-SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,'かかかかか')
-かかかかか
-SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,'か')
-あかうえお
-SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,'かか')
-あかかえお
-SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,'かかか')
-あかかかお
-SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,'かかかか')
-あかかかか
-SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,'か')
-あいかえお
-SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,'かか')
-あいかかお
-SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,'かかか')
-あいかかか
-SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,'か')
-あいうかお
-SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,'かか')
-あいうかか
-SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,'か')
-あいうえか
-SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,'　')
-　いうえお
-SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,'　　')
-　　うえお
-SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,'　　　')
-　　　えお
-SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,'　　　　')
-　　　　お
-SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,'　　　　　')
-　　　　　
-SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,'　')
-あ　うえお
-SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,'　　')
-あ　　えお
-SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,'　　　')
-あ　　　お
-SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,'　　　　')
-あ　　　　
-SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,'　')
-あい　えお
-SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,'　　')
-あい　　お
-SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,'　　　')
-あい　　　
-SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,'　')
-あいう　お
-SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,'　　')
-あいう　　
-SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,'　')
-あいうえ　
-SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,1,'丂')
-丂龖龗龞龡
-SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,2,'丂丂')
-丂丂龗龞龡
-SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,3,'丂丂丂')
-丂丂丂龞龡
-SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,4,'丂丂丂丂')
-丂丂丂丂龡
-SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,5,'丂丂丂丂丂')
-丂丂丂丂丂
-SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,1,'丂')
-龔丂龗龞龡
-SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,2,'丂丂')
-龔丂丂龞龡
-SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,3,'丂丂丂')
-龔丂丂丂龡
-SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,4,'丂丂丂丂')
-龔丂丂丂丂
-SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,1,'丂')
-龔龖丂龞龡
-SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,2,'丂丂')
-龔龖丂丂龡
-SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,3,'丂丂丂')
-龔龖丂丂丂
-SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,1,'丂')
-龔龖龗丂龡
-SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,2,'丂丂')
-龔龖龗丂丂
-SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,5,1,'丂')
-龔龖龗龞丂
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -901,6 +712,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_insert_utf8.result b/mysql-test/suite/jp/r/jp_insert_utf8.result
index 368ba35f637..b49b13f8b47 100644
--- a/mysql-test/suite/jp/r/jp_insert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_insert_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 SELECT INSERT(`鐚ｏ��`,1,1,'鐔�') FROM `鐚器��`;
 INSERT(`鐚ｏ��`,1,1,'鐔�')
 鐔駈讐鐔鰹輯鐔�
@@ -711,186 +702,6 @@ INSERT(`鐚ｏ��`,4,2,'筝�筝�' )
 SELECT INSERT(`鐚ｏ��`,5,1,'筝�') FROM `鐚器��`;
 INSERT(`鐚ｏ��`,5,1,'筝�')
 蘊�蘊�蘊�蘊�筝�
-SELECT INSERT(`鐚ｏ��`,1,1,'鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,1,'鐔�')
-鐔駈讐鐔鰹輯鐔�
-SELECT INSERT(`鐚ｏ��`,1,2,'鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,2,'鐔駈酋')
-鐔駈酋鐔鰹輯鐔�
-SELECT INSERT(`鐚ｏ��`,1,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,3,'鐔駈酋鐔�')
-鐔駈酋鐔駈輯鐔�
-SELECT INSERT(`鐚ｏ��`,1,4,'鐔駈酋鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,4,'鐔駈酋鐔駈酋')
-鐔駈酋鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,1,5,'鐔駈酋鐔駈酋鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,5,'鐔駈酋鐔駈酋鐔�')
-鐔駈酋鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,2,1,'鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,1,'鐔�')
-鐔縁酋鐔鰹輯鐔�
-SELECT INSERT(`鐚ｏ��`,2,2,'鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,2,'鐔駈酋')
-鐔縁酋鐔駈輯鐔�
-SELECT INSERT(`鐚ｏ��`,2,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,3,'鐔駈酋鐔�')
-鐔縁酋鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,2,4,'鐔駈酋鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,4,'鐔駈酋鐔駈酋')
-鐔縁酋鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,3,1,'鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,1,'鐔�')
-鐔縁讐鐔駈輯鐔�
-SELECT INSERT(`鐚ｏ��`,3,2,'鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,2,'鐔駈酋')
-鐔縁讐鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,3,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,3,'鐔駈酋鐔�')
-鐔縁讐鐔駈酋鐔�
-SELECT INSERT(`鐚ｏ��`,4,1,'鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,1,'鐔�')
-鐔縁讐鐔鰹酋鐔�
-SELECT INSERT(`鐚ｏ��`,4,2,'鐔駈酋') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,2,'鐔駈酋')
-鐔縁讐鐔鰹酋鐔�
-SELECT INSERT(`鐚ｏ��`,5,1,'鐔�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,5,1,'鐔�')
-鐔縁讐鐔鰹輯鐔�
-SELECT INSERT(`鐚ｏ��`,1,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,4,'������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,4,'������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,5,'���������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,5,'���������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,4,'������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,4,'������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,4,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,4,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,5,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,5,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,4,'������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,4,'������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,5,'���������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,5,'���������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,2,4,'������������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,4,'������������')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,3,3,'���������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,3,'���������')
-���������������
-SELECT INSERT(`鐚ｏ��`,4,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,4,2,'������') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,2,'������')
-���������������
-SELECT INSERT(`鐚ｏ��`,5,1,'���') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,5,1,'���')
-���������������
-SELECT INSERT(`鐚ｏ��`,1,1,'筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,1,'筝�')
-筝�蘊�蘊�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,1,2,'筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,2,'筝�筝�')
-筝�筝�蘊�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,1,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,3,'筝�筝�筝�')
-筝�筝�筝�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,1,4,'筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,4,'筝�筝�筝�筝�')
-筝�筝�筝�筝�蘊�
-SELECT INSERT(`鐚ｏ��`,1,5,'筝�筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,1,5,'筝�筝�筝�筝�筝�')
-筝�筝�筝�筝�筝�
-SELECT INSERT(`鐚ｏ��`,2,1,'筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,1,'筝�')
-蘊�筝�蘊�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,2,2,'筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,2,'筝�筝�')
-蘊�筝�筝�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,2,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,3,'筝�筝�筝�')
-蘊�筝�筝�筝�蘊�
-SELECT INSERT(`鐚ｏ��`,2,4,'筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,2,4,'筝�筝�筝�筝�')
-蘊�筝�筝�筝�筝�
-SELECT INSERT(`鐚ｏ��`,3,1,'筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,1,'筝�')
-蘊�蘊�筝�蘊�蘊�
-SELECT INSERT(`鐚ｏ��`,3,2,'筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,2,'筝�筝�')
-蘊�蘊�筝�筝�蘊�
-SELECT INSERT(`鐚ｏ��`,3,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,3,3,'筝�筝�筝�')
-蘊�蘊�筝�筝�筝�
-SELECT INSERT(`鐚ｏ��`,4,1,'筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,1,'筝�')
-蘊�蘊�蘊�筝�蘊�
-SELECT INSERT(`鐚ｏ��`,4,2,'筝�筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,4,2,'筝�筝�')
-蘊�蘊�蘊�筝�筝�
-SELECT INSERT(`鐚ｏ��`,5,1,'筝�') FROM `鐚器��鐚�`;
-INSERT(`鐚ｏ��`,5,1,'筝�')
-蘊�蘊�蘊�蘊�筝�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -900,6 +711,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result
index 9a6dea5a426..b102b1a1b46 100644
--- a/mysql-test/suite/jp/r/jp_instr_sjis.result
+++ b/mysql-test/suite/jp/r/jp_instr_sjis.result
@@ -7,7 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -31,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 SELECT INSTR(`�b�P`,'�') from `�s�P`;
 INSTR(`�b�P`,'�')
 1
@@ -196,60 +189,6 @@ INSTR(`�b�P`,'�\')
 SELECT INSTR(`�b�P`,'�\') from `�s�X`;
 INSTR(`�b�P`,'�\')
 0
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-1
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-2
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-3
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-4
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-5
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-INSTR(`�b�P`,'�')
-0
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-1
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-2
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-3
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-4
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-5
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-INSTR(`�b�P`,'��')
-0
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-1
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-2
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-3
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-4
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-5
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-INSTR(`�b�P`,'�\')
-0
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -259,6 +198,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_instr_ucs2.result b/mysql-test/suite/jp/r/jp_instr_ucs2.result
index 352525eee0b..5840bf49088 100644
--- a/mysql-test/suite/jp/r/jp_instr_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_instr_ucs2.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -17,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -32,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
 INSTR(`Ｃ１`,'ｱ')
 1
@@ -197,60 +190,6 @@ INSTR(`Ｃ１`,'龡')
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
 INSTR(`Ｃ１`,'丂')
 0
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｱ')
-1
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｲ')
-2
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｳ')
-3
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｴ')
-4
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｵ')
-5
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ﾝ')
-0
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-INSTR(`Ｃ１`,'あ')
-1
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-INSTR(`Ｃ１`,'い')
-2
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-INSTR(`Ｃ１`,'う')
-3
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-INSTR(`Ｃ１`,'え')
-4
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-INSTR(`Ｃ１`,'お')
-5
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-INSTR(`Ｃ１`,'ん')
-0
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龔')
-1
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龖')
-2
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龗')
-3
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龞')
-4
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龡')
-5
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-INSTR(`Ｃ１`,'丂')
-0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -260,6 +199,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_instr_ujis.result b/mysql-test/suite/jp/r/jp_instr_ujis.result
index 0cf9895a740..345d23ecbcb 100644
--- a/mysql-test/suite/jp/r/jp_instr_ujis.result
+++ b/mysql-test/suite/jp/r/jp_instr_ujis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -31,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
 INSTR(`Ｃ１`,'ｱ')
 1
@@ -196,60 +189,6 @@ INSTR(`Ｃ１`,'龡')
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
 INSTR(`Ｃ１`,'丂')
 0
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｱ')
-1
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｲ')
-2
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｳ')
-3
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｴ')
-4
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｵ')
-5
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ﾝ')
-0
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-INSTR(`Ｃ１`,'あ')
-1
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-INSTR(`Ｃ１`,'い')
-2
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-INSTR(`Ｃ１`,'う')
-3
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-INSTR(`Ｃ１`,'え')
-4
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-INSTR(`Ｃ１`,'お')
-5
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-INSTR(`Ｃ１`,'ん')
-0
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龔')
-1
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龖')
-2
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龗')
-3
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龞')
-4
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龡')
-5
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-INSTR(`Ｃ１`,'丂')
-0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_instr_utf8.result b/mysql-test/suite/jp/r/jp_instr_utf8.result
index 0e55227e4b7..fb6b8c7c6ea 100644
--- a/mysql-test/suite/jp/r/jp_instr_utf8.result
+++ b/mysql-test/suite/jp/r/jp_instr_utf8.result
@@ -7,7 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -31,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��`;
 INSTR(`鐚ｏ��`,'鐔�')
 1
@@ -196,60 +189,6 @@ INSTR(`鐚ｏ��`,'蘊�')
 SELECT INSTR(`鐚ｏ��`,'筝�') from `鐚器��`;
 INSTR(`鐚ｏ��`,'筝�')
 0
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐔�')
-1
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐔�')
-2
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐔�')
-3
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐔�')
-4
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐔�')
-5
-SELECT INSTR(`鐚ｏ��`,'鐓�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'鐓�')
-0
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-1
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-2
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-3
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-4
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-5
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'���')
-0
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'蘊�')
-1
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'蘊�')
-2
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'蘊�')
-3
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'蘊�')
-4
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'蘊�')
-5
-SELECT INSTR(`鐚ｏ��`,'筝�') from `鐚器��鐚�`;
-INSTR(`鐚ｏ��`,'筝�')
-0
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -259,6 +198,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_join_sjis.result b/mysql-test/suite/jp/r/jp_join_sjis.result
index a5ccc58ae4c..5e7e51e0925 100644
--- a/mysql-test/suite/jp/r/jp_join_sjis.result
+++ b/mysql-test/suite/jp/r/jp_join_sjis.result
@@ -1,15 +1,21 @@
-drop table if exists `�s�P`;
-drop table if exists `�s�Q`;
-drop table if exists `�s�R`;
-drop table if exists `�s�S`;
-drop table if exists `�s�T`;
-drop table if exists `�s�U`;
-drop table if exists `�s�V`;
-drop table if exists `�s�W`;
-drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
+DROP TABLE IF EXISTS `�s�Pa`;
+DROP TABLE IF EXISTS `�s�Pb`;
+DROP TABLE IF EXISTS `�s�Qa`;
+DROP TABLE IF EXISTS `�s�Qb`;
+DROP TABLE IF EXISTS `�s�Ra`;
+DROP TABLE IF EXISTS `�s�Rb`;
+DROP TABLE IF EXISTS `�s�Sa`;
+DROP TABLE IF EXISTS `�s�Sb`;
+DROP TABLE IF EXISTS `�s�Ta`;
+DROP TABLE IF EXISTS `�s�Tb`;
+DROP TABLE IF EXISTS `�s�Ua`;
+DROP TABLE IF EXISTS `�s�Ub`;
+DROP TABLE IF EXISTS `�s�Va`;
+DROP TABLE IF EXISTS `�s�Vb`;
+DROP TABLE IF EXISTS `�s�Wa`;
+DROP TABLE IF EXISTS `�s�Wb`;
+DROP TABLE IF EXISTS `�s�Xa`;
+DROP TABLE IF EXISTS `�s�Xb`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
@@ -24,18 +30,12 @@ CREATE TABLE `�s�Ta` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine
 CREATE TABLE `�s�Tb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ua` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ub` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Oa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Ob` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�Pa` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�Pb` VALUES ('�');
 INSERT INTO `�s�Qa` VALUES ('��'),('��'),('��');
@@ -54,12 +54,6 @@ INSERT INTO `�s�Wa` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�Wb` VALUES ('��');
 INSERT INTO `�s�Xa` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�Xb` VALUES ('�\');
-INSERT INTO `�s�P�Oa` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�Ob` VALUES ('�');
-INSERT INTO `�s�P�Pa` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Pb` VALUES ('��');
-INSERT INTO `�s�P�Qa` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�Qb` VALUES ('�\');
 SELECT * FROM `�s�Pa` JOIN `�s�Pb`;
 �b�P	�b�P
 �	�
@@ -71,31 +65,31 @@ SELECT * FROM `�s�Pa` INNER JOIN `�s�Pb`;
 �	�
 �	�
 SELECT * FROM `�s�Pa` JOIN `�s�Pb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Pa` INNER JOIN `�s�Pb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Pa` CROSS JOIN `�s�Pb`;
 �b�P	�b�P
 �	�
 �	�
 �	�
 SELECT * FROM `�s�Pa` LEFT JOIN `�s�Pb` USING (`�b�P`);
-�b�P	�b�P
-�	�
-�	NULL
-�	NULL
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Pa` LEFT JOIN `�s�Pb` ON (`�s�Pa`.`�b�P` = `�s�Pb`.`�b�P`);
 �b�P	�b�P
 �	�
 �	NULL
 �	NULL
 SELECT * FROM `�s�Pb` RIGHT JOIN `�s�Pa` USING (`�b�P`);
-�b�P	�b�P
-�	�
-NULL	�
-NULL	�
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Pb` RIGHT JOIN `�s�Pa` ON (`�s�Pa`.`�b�P` = `�s�Pb`.`�b�P`);
 �b�P	�b�P
 �	�
@@ -112,31 +106,31 @@ SELECT * FROM `�s�Qa` INNER JOIN `�s�Qb`;
 ��	��
 ��	��
 SELECT * FROM `�s�Qa` JOIN `�s�Qb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Qa` INNER JOIN `�s�Qb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Qa` CROSS JOIN `�s�Qb`;
 �b�P	�b�P
 ��	��
 ��	��
 ��	��
 SELECT * FROM `�s�Qa` LEFT JOIN `�s�Qb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-��	NULL
-��	NULL
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Qa` LEFT JOIN `�s�Qb` ON (`�s�Qa`.`�b�P` = `�s�Qb`.`�b�P`);
 �b�P	�b�P
 ��	��
 ��	NULL
 ��	NULL
 SELECT * FROM `�s�Qb` RIGHT JOIN `�s�Qa` USING (`�b�P`);
-�b�P	�b�P
-��	��
-NULL	��
-NULL	��
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Qb` RIGHT JOIN `�s�Qa` ON (`�s�Qa`.`�b�P` = `�s�Qb`.`�b�P`);
 �b�P	�b�P
 ��	��
@@ -153,31 +147,31 @@ SELECT * FROM `�s�Ra` INNER JOIN `�s�Rb`;
 �\	�\
 �\	�\
 SELECT * FROM `�s�Ra` JOIN `�s�Rb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Ra` INNER JOIN `�s�Rb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Ra` CROSS JOIN `�s�Rb`;
 �b�P	�b�P
 �\	�\
 �\	�\
 �\	�\
 SELECT * FROM `�s�Ra` LEFT JOIN `�s�Rb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-�\	NULL
-�\	NULL
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Ra` LEFT JOIN `�s�Rb` ON (`�s�Ra`.`�b�P` = `�s�Rb`.`�b�P`);
 �b�P	�b�P
 �\	�\
 �\	NULL
 �\	NULL
 SELECT * FROM `�s�Rb` RIGHT JOIN `�s�Ra` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-NULL	�\
-NULL	�\
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Rb` RIGHT JOIN `�s�Ra` ON (`�s�Ra`.`�b�P` = `�s�Rb`.`�b�P`);
 �b�P	�b�P
 �\	�\
@@ -194,31 +188,31 @@ SELECT * FROM `�s�Sa` INNER JOIN `�s�Sb`;
 �	�
 �	�
 SELECT * FROM `�s�Sa` JOIN `�s�Sb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Sa` INNER JOIN `�s�Sb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Sa` CROSS JOIN `�s�Sb`;
 �b�P	�b�P
 �	�
 �	�
 �	�
 SELECT * FROM `�s�Sa` LEFT JOIN `�s�Sb` USING (`�b�P`);
-�b�P	�b�P
-�	�
-�	NULL
-�	NULL
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Sa` LEFT JOIN `�s�Sb` ON (`�s�Sa`.`�b�P` = `�s�Sb`.`�b�P`);
 �b�P	�b�P
 �	�
 �	NULL
 �	NULL
 SELECT * FROM `�s�Sb` RIGHT JOIN `�s�Sa` USING (`�b�P`);
-�b�P	�b�P
-�	�
-NULL	�
-NULL	�
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Sb` RIGHT JOIN `�s�Sa` ON (`�s�Sa`.`�b�P` = `�s�Sb`.`�b�P`);
 �b�P	�b�P
 �	�
@@ -235,31 +229,31 @@ SELECT * FROM `�s�Ta` INNER JOIN `�s�Tb`;
 ��	��
 ��	��
 SELECT * FROM `�s�Ta` JOIN `�s�Tb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Ta` INNER JOIN `�s�Tb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Ta` CROSS JOIN `�s�Tb`;
 �b�P	�b�P
 ��	��
 ��	��
 ��	��
 SELECT * FROM `�s�Ta` LEFT JOIN `�s�Tb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-��	NULL
-��	NULL
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Ta` LEFT JOIN `�s�Tb` ON (`�s�Ta`.`�b�P` = `�s�Tb`.`�b�P`);
 �b�P	�b�P
 ��	��
 ��	NULL
 ��	NULL
 SELECT * FROM `�s�Tb` RIGHT JOIN `�s�Ta` USING (`�b�P`);
-�b�P	�b�P
-��	��
-NULL	��
-NULL	��
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Tb` RIGHT JOIN `�s�Ta` ON (`�s�Ta`.`�b�P` = `�s�Tb`.`�b�P`);
 �b�P	�b�P
 ��	��
@@ -276,31 +270,31 @@ SELECT * FROM `�s�Ua` INNER JOIN `�s�Ub`;
 �\	�\
 �\	�\
 SELECT * FROM `�s�Ua` JOIN `�s�Ub` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Ua` INNER JOIN `�s�Ub` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Ua` CROSS JOIN `�s�Ub`;
 �b�P	�b�P
 �\	�\
 �\	�\
 �\	�\
 SELECT * FROM `�s�Ua` LEFT JOIN `�s�Ub` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-�\	NULL
-�\	NULL
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Ua` LEFT JOIN `�s�Ub` ON (`�s�Ua`.`�b�P` = `�s�Ub`.`�b�P`);
 �b�P	�b�P
 �\	�\
 �\	NULL
 �\	NULL
 SELECT * FROM `�s�Ub` RIGHT JOIN `�s�Ua` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-NULL	�\
-NULL	�\
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Ub` RIGHT JOIN `�s�Ua` ON (`�s�Ua`.`�b�P` = `�s�Ub`.`�b�P`);
 �b�P	�b�P
 �\	�\
@@ -317,31 +311,31 @@ SELECT * FROM `�s�Va` INNER JOIN `�s�Vb`;
 �	�
 �	�
 SELECT * FROM `�s�Va` JOIN `�s�Vb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Va` INNER JOIN `�s�Vb` USING (`�b�P`);
-�b�P	�b�P
-�	�
+�b�P
+�
 SELECT * FROM `�s�Va` CROSS JOIN `�s�Vb`;
 �b�P	�b�P
 �	�
 �	�
 �	�
 SELECT * FROM `�s�Va` LEFT JOIN `�s�Vb` USING (`�b�P`);
-�b�P	�b�P
-�	�
-�	NULL
-�	NULL
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Va` LEFT JOIN `�s�Vb` ON (`�s�Va`.`�b�P` = `�s�Vb`.`�b�P`);
 �b�P	�b�P
 �	�
 �	NULL
 �	NULL
 SELECT * FROM `�s�Vb` RIGHT JOIN `�s�Va` USING (`�b�P`);
-�b�P	�b�P
-�	�
-NULL	�
-NULL	�
+�b�P
+�
+�
+�
 SELECT * FROM `�s�Vb` RIGHT JOIN `�s�Va` ON (`�s�Va`.`�b�P` = `�s�Vb`.`�b�P`);
 �b�P	�b�P
 �	�
@@ -358,31 +352,31 @@ SELECT * FROM `�s�Wa` INNER JOIN `�s�Wb`;
 ��	��
 ��	��
 SELECT * FROM `�s�Wa` JOIN `�s�Wb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Wa` INNER JOIN `�s�Wb` USING (`�b�P`);
-�b�P	�b�P
-��	��
+�b�P
+��
 SELECT * FROM `�s�Wa` CROSS JOIN `�s�Wb`;
 �b�P	�b�P
 ��	��
 ��	��
 ��	��
 SELECT * FROM `�s�Wa` LEFT JOIN `�s�Wb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-��	NULL
-��	NULL
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Wa` LEFT JOIN `�s�Wb` ON (`�s�Wa`.`�b�P` = `�s�Wb`.`�b�P`);
 �b�P	�b�P
 ��	��
 ��	NULL
 ��	NULL
 SELECT * FROM `�s�Wb` RIGHT JOIN `�s�Wa` USING (`�b�P`);
-�b�P	�b�P
-��	��
-NULL	��
-NULL	��
+�b�P
+��
+��
+��
 SELECT * FROM `�s�Wb` RIGHT JOIN `�s�Wa` ON (`�s�Wa`.`�b�P` = `�s�Wb`.`�b�P`);
 �b�P	�b�P
 ��	��
@@ -399,159 +393,36 @@ SELECT * FROM `�s�Xa` INNER JOIN `�s�Xb`;
 �\	�\
 �\	�\
 SELECT * FROM `�s�Xa` JOIN `�s�Xb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Xa` INNER JOIN `�s�Xb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
+�b�P
+�\
 SELECT * FROM `�s�Xa` CROSS JOIN `�s�Xb`;
 �b�P	�b�P
 �\	�\
 �\	�\
 �\	�\
 SELECT * FROM `�s�Xa` LEFT JOIN `�s�Xb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-�\	NULL
-�\	NULL
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Xa` LEFT JOIN `�s�Xb` ON (`�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
 �b�P	�b�P
 �\	�\
 �\	NULL
 �\	NULL
 SELECT * FROM `�s�Xb` RIGHT JOIN `�s�Xa` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-NULL	�\
-NULL	�\
+�b�P
+�\
+�\
+�\
 SELECT * FROM `�s�Xb` RIGHT JOIN `�s�Xa` ON (`�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
 �b�P	�b�P
 �\	�\
 NULL	�\
 NULL	�\
-SELECT * FROM `�s�P�Oa` JOIN `�s�P�Ob`;
-�b�P	�b�P
-�	�
-�	�
-�	�
-SELECT * FROM `�s�P�Oa` INNER JOIN `�s�P�Ob`;
-�b�P	�b�P
-�	�
-�	�
-�	�
-SELECT * FROM `�s�P�Oa` JOIN `�s�P�Ob` USING (`�b�P`);
-�b�P	�b�P
-�	�
-SELECT * FROM `�s�P�Oa` INNER JOIN `�s�P�Ob` USING (`�b�P`);
-�b�P	�b�P
-�	�
-SELECT * FROM `�s�P�Oa` CROSS JOIN `�s�P�Ob`;
-�b�P	�b�P
-�	�
-�	�
-�	�
-SELECT * FROM `�s�P�Oa` LEFT JOIN `�s�P�Ob` USING (`�b�P`);
-�b�P	�b�P
-�	�
-�	NULL
-�	NULL
-SELECT * FROM `�s�P�Oa` LEFT JOIN `�s�P�Ob` ON (`�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-�b�P	�b�P
-�	�
-�	NULL
-�	NULL
-SELECT * FROM `�s�P�Ob` RIGHT JOIN `�s�P�Oa` USING (`�b�P`);
-�b�P	�b�P
-�	�
-NULL	�
-NULL	�
-SELECT * FROM `�s�P�Ob` RIGHT JOIN `�s�P�Oa` ON (`�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-�b�P	�b�P
-�	�
-NULL	�
-NULL	�
-SELECT * FROM `�s�P�Pa` JOIN `�s�P�Pb`;
-�b�P	�b�P
-��	��
-��	��
-��	��
-SELECT * FROM `�s�P�Pa` INNER JOIN `�s�P�Pb`;
-�b�P	�b�P
-��	��
-��	��
-��	��
-SELECT * FROM `�s�P�Pa` JOIN `�s�P�Pb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-SELECT * FROM `�s�P�Pa` INNER JOIN `�s�P�Pb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-SELECT * FROM `�s�P�Pa` CROSS JOIN `�s�P�Pb`;
-�b�P	�b�P
-��	��
-��	��
-��	��
-SELECT * FROM `�s�P�Pa` LEFT JOIN `�s�P�Pb` USING (`�b�P`);
-�b�P	�b�P
-��	��
-��	NULL
-��	NULL
-SELECT * FROM `�s�P�Pa` LEFT JOIN `�s�P�Pb` ON (`�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-�b�P	�b�P
-��	��
-��	NULL
-��	NULL
-SELECT * FROM `�s�P�Pb` RIGHT JOIN `�s�P�Pa` USING (`�b�P`);
-�b�P	�b�P
-��	��
-NULL	��
-NULL	��
-SELECT * FROM `�s�P�Pb` RIGHT JOIN `�s�P�Pa` ON (`�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-�b�P	�b�P
-��	��
-NULL	��
-NULL	��
-SELECT * FROM `�s�P�Qa` JOIN `�s�P�Qb`;
-�b�P	�b�P
-�\	�\
-�\	�\
-�\	�\
-SELECT * FROM `�s�P�Qa` INNER JOIN `�s�P�Qb`;
-�b�P	�b�P
-�\	�\
-�\	�\
-�\	�\
-SELECT * FROM `�s�P�Qa` JOIN `�s�P�Qb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-SELECT * FROM `�s�P�Qa` INNER JOIN `�s�P�Qb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-SELECT * FROM `�s�P�Qa` CROSS JOIN `�s�P�Qb`;
-�b�P	�b�P
-�\	�\
-�\	�\
-�\	�\
-SELECT * FROM `�s�P�Qa` LEFT JOIN `�s�P�Qb` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-�\	NULL
-�\	NULL
-SELECT * FROM `�s�P�Qa` LEFT JOIN `�s�P�Qb` ON (`�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-�b�P	�b�P
-�\	�\
-�\	NULL
-�\	NULL
-SELECT * FROM `�s�P�Qb` RIGHT JOIN `�s�P�Qa` USING (`�b�P`);
-�b�P	�b�P
-�\	�\
-NULL	�\
-NULL	�\
-SELECT * FROM `�s�P�Qb` RIGHT JOIN `�s�P�Qa` ON (`�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-�b�P	�b�P
-�\	�\
-NULL	�\
-NULL	�\
 DROP TABLE `�s�Pa`;
 DROP TABLE `�s�Pb`;
 DROP TABLE `�s�Qa`;
@@ -570,9 +441,3 @@ DROP TABLE `�s�Wa`;
 DROP TABLE `�s�Wb`;
 DROP TABLE `�s�Xa`;
 DROP TABLE `�s�Xb`;
-DROP TABLE `�s�P�Oa`;
-DROP TABLE `�s�P�Ob`;
-DROP TABLE `�s�P�Pa`;
-DROP TABLE `�s�P�Pb`;
-DROP TABLE `�s�P�Qa`;
-DROP TABLE `�s�P�Qb`;
diff --git a/mysql-test/suite/jp/r/jp_join_ucs2.result b/mysql-test/suite/jp/r/jp_join_ucs2.result
index 76988f15cc4..d3ebd9c94ca 100644
--- a/mysql-test/suite/jp/r/jp_join_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_join_ucs2.result
@@ -1,15 +1,21 @@
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,24 +25,18 @@ CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine
 CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
 INSERT INTO `Ｔ１b` VALUES ('ｱ');
 INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
@@ -55,12 +55,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -72,31 +66,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -113,31 +107,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -154,31 +148,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
@@ -195,31 +189,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -236,31 +230,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -277,31 +271,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
@@ -318,31 +312,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -359,31 +353,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`.`Ｃ１`);
 Ｃ１	Ｃ１
 あ	あ
@@ -400,159 +394,36 @@ 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`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 NULL	龖
 NULL	龗
-SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`;
-Ｃ１	Ｃ１
-ｱ	ｱ
-ｶ	ｱ
-ｻ	ｱ
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-ｱ	ｱ
-NULL	ｶ
-NULL	ｻ
-SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`;
-Ｃ１	Ｃ１
-あ	あ
-か	あ
-さ	あ
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-あ	あ
-NULL	か
-NULL	さ
-SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`;
-Ｃ１	Ｃ１
-龔	龔
-龖	龔
-龗	龔
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-龔	龔
-NULL	龖
-NULL	龗
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -571,9 +442,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/r/jp_join_ujis.result b/mysql-test/suite/jp/r/jp_join_ujis.result
index ac430cd9b5e..13de9dae9ca 100644
--- a/mysql-test/suite/jp/r/jp_join_ujis.result
+++ b/mysql-test/suite/jp/r/jp_join_ujis.result
@@ -1,15 +1,21 @@
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,24 +24,18 @@ CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine
 CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
 INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
 INSERT INTO `Ｔ１b` VALUES ('ｱ');
 INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
@@ -54,12 +54,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
 Ｃ１	Ｃ１
 ｱ	ｱ
@@ -71,31 +65,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 +106,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 +147,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 +188,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 +229,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 +270,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 +311,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 +352,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,159 +393,36 @@ 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`.`Ｃ１`);
 Ｃ１	Ｃ１
 龔	龔
 NULL	龖
 NULL	龗
-SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`;
-Ｃ１	Ｃ１
-ｱ	ｱ
-ｶ	ｱ
-ｻ	ｱ
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-ｱ	ｱ
-NULL	ｶ
-NULL	ｻ
-SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`;
-Ｃ１	Ｃ１
-あ	あ
-か	あ
-さ	あ
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-あ	あ
-NULL	か
-NULL	さ
-SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`;
-Ｃ１	Ｃ１
-龔	龔
-龖	龔
-龗	龔
-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`.`Ｃ１`);
-Ｃ１	Ｃ１
-龔	龔
-NULL	龖
-NULL	龗
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -570,9 +441,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/r/jp_join_utf8.result b/mysql-test/suite/jp/r/jp_join_utf8.result
index 716e97a2bb3..a4781c0fece 100644
--- a/mysql-test/suite/jp/r/jp_join_utf8.result
+++ b/mysql-test/suite/jp/r/jp_join_utf8.result
@@ -1,41 +1,41 @@
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
 SET NAMES utf8;
 SET character_set_database = utf8;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��a` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��b` VALUES ('鐔�');
 INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
@@ -54,12 +54,6 @@ INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��b` VALUES ('���');
 INSERT INTO `鐚器��a` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��b` VALUES ('蘊�');
-INSERT INTO `鐚器��鐚�a` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�b` VALUES ('鐔�');
-INSERT INTO `鐚器��鐚�a` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�b` VALUES ('���');
-INSERT INTO `鐚器��鐚�a` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�b` VALUES ('蘊�');
 SELECT * FROM `鐚器��a` JOIN `鐚器��b`;
 鐚ｏ��	鐚ｏ��
 鐔�	鐔�
@@ -71,31 +65,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 +106,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 +147,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 +188,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 +229,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 +270,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 +311,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 +352,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,159 +393,36 @@ 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`.`鐚ｏ��`);
 鐚ｏ��	鐚ｏ��
 蘊�	蘊�
 NULL	蘊�
 NULL	蘊�
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-鐚ｏ��	鐚ｏ��
-鐔�	鐔�
-鐔�	鐔�
-鐔�	鐔�
-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`.`鐚ｏ��`);
-鐚ｏ��	鐚ｏ��
-鐔�	鐔�
-NULL	鐔�
-NULL	鐔�
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-鐚ｏ��	鐚ｏ��
-���	���
-���	���
-���	���
-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`.`鐚ｏ��`);
-鐚ｏ��	鐚ｏ��
-���	���
-NULL	���
-NULL	���
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-鐚ｏ��	鐚ｏ��
-蘊�	蘊�
-蘊�	蘊�
-蘊�	蘊�
-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`.`鐚ｏ��`);
-鐚ｏ��	鐚ｏ��
-蘊�	蘊�
-NULL	蘊�
-NULL	蘊�
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
@@ -570,9 +441,3 @@ DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
diff --git a/mysql-test/suite/jp/r/jp_left_sjis.result b/mysql-test/suite/jp/r/jp_left_sjis.result
index ae5564186ab..037fb05289e 100644
--- a/mysql-test/suite/jp/r/jp_left_sjis.result
+++ b/mysql-test/suite/jp/r/jp_left_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P`;
 �b�P	LEFT(`�b�P`,0)
 	
@@ -468,150 +459,6 @@ SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�X`;
 �\�\	�\�\
 �\	�\
 	
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,1)
-渦慨�	�
-渦慨	�
-渦�	�
-渦	�
-�	�
-	
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,2)
-渦慨�	渦
-渦慨	渦
-渦�	渦
-渦	渦
-�	�
-	
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,3)
-渦慨�	渦�
-渦慨	渦�
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,4)
-渦慨�	渦慨
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�O`;
-�b�P	LEFT(`�b�P`,5)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,1)
-����������	��
-��������	��
-������	��
-����	��
-��	��
-	
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,2)
-����������	����
-��������	����
-������	����
-����	����
-��	��
-	
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,3)
-����������	������
-��������	������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,4)
-����������	��������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�P`;
-�b�P	LEFT(`�b�P`,5)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,1)
-�\�\�\�\�\	�\
-�\�\�\�\	�\
-�\�\�\	�\
-�\�\	�\
-�\	�\
-	
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,2)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,4)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�Q`;
-�b�P	LEFT(`�b�P`,5)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -621,6 +468,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_left_ucs2.result b/mysql-test/suite/jp/r/jp_left_ucs2.result
index 349883e9064..ca77bf7f16c 100644
--- a/mysql-test/suite/jp/r/jp_left_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_left_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`;
 Ｃ１	LEFT(`Ｃ１`,0)
 	
@@ -469,150 +460,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -622,6 +469,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_left_ujis.result b/mysql-test/suite/jp/r/jp_left_ujis.result
index bd3efc67eec..50483f858ce 100644
--- a/mysql-test/suite/jp/r/jp_left_ujis.result
+++ b/mysql-test/suite/jp/r/jp_left_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`;
 Ｃ１	LEFT(`Ｃ１`,0)
 	
@@ -468,150 +459,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`;
-Ｃ１	LEFT(`Ｃ１`,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`;
-Ｃ１	LEFT(`Ｃ１`,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`;
-Ｃ１	LEFT(`Ｃ１`,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -621,6 +468,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_left_utf8.result b/mysql-test/suite/jp/r/jp_left_utf8.result
index 62cca976fe0..cfc1d8532e2 100644
--- a/mysql-test/suite/jp/r/jp_left_utf8.result
+++ b/mysql-test/suite/jp/r/jp_left_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��`;
 鐚ｏ��	LEFT(`鐚ｏ��`,0)
 	
@@ -468,150 +459,6 @@ SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��`;
 蘊�蘊�	蘊�蘊�
 蘊�	蘊�
 	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,1)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	鐔�
-鐔縁讐	鐔�
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,2)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐
-鐔縁讐鐔鰹輯	鐔縁讐
-鐔縁讐鐔�	鐔縁讐
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,3)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔�
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,4)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,5)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,1)
-���������������	���
-������������	���
-���������	���
-������	���
-���	���
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,2)
-���������������	������
-������������	������
-���������	������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,3)
-���������������	���������
-������������	���������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,4)
-���������������	������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,5)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,1)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	LEFT(`鐚ｏ��`,5)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -621,6 +468,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_length_sjis.result b/mysql-test/suite/jp/r/jp_length_sjis.result
index 51055e09233..5de256962c9 100644
--- a/mysql-test/suite/jp/r/jp_length_sjis.result
+++ b/mysql-test/suite/jp/r/jp_length_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P`;
 �b�P	LENGTH(`�b�P`)
 	0
@@ -108,30 +99,6 @@ SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�X`;
 �\�\	4
 �\	2
 	0
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�O`;
-�b�P	LENGTH(`�b�P`)
-渦慨�	5
-渦慨	4
-渦�	3
-渦	2
-�	1
-	0
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�P`;
-�b�P	LENGTH(`�b�P`)
-����������	10
-��������	8
-������	6
-����	4
-��	2
-	0
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�Q`;
-�b�P	LENGTH(`�b�P`)
-�\�\�\�\�\	10
-�\�\�\�\	8
-�\�\�\	6
-�\�\	4
-�\	2
-	0
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -141,6 +108,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_length_ucs2.result b/mysql-test/suite/jp/r/jp_length_ucs2.result
index 569e012f7d3..6c5cb3a74ba 100644
--- a/mysql-test/suite/jp/r/jp_length_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_length_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	LENGTH(`Ｃ１`)
 	0
@@ -109,30 +100,6 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`;
 龔龖	4
 龔	2
 	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	10
-ｱｲｳｴ	8
-ｱｲｳ	6
-ｱｲ	4
-ｱ	2
-	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	LENGTH(`Ｃ１`)
-あいうえお	10
-あいうえ	8
-あいう	6
-あい	4
-あ	2
-	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	LENGTH(`Ｃ１`)
-龔龖龗龞龡	10
-龔龖龗龞	8
-龔龖龗	6
-龔龖	4
-龔	2
-	0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -142,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_length_ujis.result b/mysql-test/suite/jp/r/jp_length_ujis.result
index 288cc06a2ef..3b3d3d33eff 100644
--- a/mysql-test/suite/jp/r/jp_length_ujis.result
+++ b/mysql-test/suite/jp/r/jp_length_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	LENGTH(`Ｃ１`)
 	0
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`;
 龔龖	6
 龔	3
 	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	10
-ｱｲｳｴ	8
-ｱｲｳ	6
-ｱｲ	4
-ｱ	2
-	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	LENGTH(`Ｃ１`)
-あいうえお	10
-あいうえ	8
-あいう	6
-あい	4
-あ	2
-	0
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	LENGTH(`Ｃ１`)
-龔龖龗龞龡	15
-龔龖龗龞	12
-龔龖龗	9
-龔龖	6
-龔	3
-	0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_length_utf8.result b/mysql-test/suite/jp/r/jp_length_utf8.result
index 11b4c523053..6d4d4e439e9 100644
--- a/mysql-test/suite/jp/r/jp_length_utf8.result
+++ b/mysql-test/suite/jp/r/jp_length_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 鐚ｏ��	LENGTH(`鐚ｏ��`)
 	0
@@ -108,30 +99,6 @@ SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 蘊�蘊�	6
 蘊�	3
 	0
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	LENGTH(`鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	15
-鐔縁讐鐔鰹輯	12
-鐔縁讐鐔�	9
-鐔縁讐	6
-鐔�	3
-	0
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	LENGTH(`鐚ｏ��`)
-���������������	15
-������������	12
-���������	9
-������	6
-���	3
-	0
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	LENGTH(`鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	15
-蘊�蘊�蘊�蘊�	12
-蘊�蘊�蘊�	9
-蘊�蘊�	6
-蘊�	3
-	0
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -141,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_like_sjis.result b/mysql-test/suite/jp/r/jp_like_sjis.result
index a8145fb08f0..0d9cfff5557 100644
--- a/mysql-test/suite/jp/r/jp_like_sjis.result
+++ b/mysql-test/suite/jp/r/jp_like_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT * FROM `�s�P` WHERE `�b�P` LIKE ' %';
 �b�P
  !"#$%&'()*+,-./
@@ -258,56 +249,6 @@ SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�
 SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 �b�P
 �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE ' %';
-�b�P
- !"#$%&'()*+,-./
- 、�ぅΗ┤������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% %';
-�b�P
- !"#$%&'()*+,-./
- 、�ぅΗ┤������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% ';
-�b�P
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '�%';
-�b�P
-請唾津毒班碧麺力
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%忤%';
-�b�P
-佰厶壞嶐慵无槿渤
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%�';
-�b�P
-葦桶患況弦沙悉梢
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%葦桶患況弦沙悉梢';
-�b�P
-葦桶患況弦沙悉梢
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '�@%';
-�b�P
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@%';
-�b�P
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�E�E�����������������E�E�E�E���E�E�E�E�@
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@';
-�b�P
-�E�E�����������������E�E�E�E���E�E�E�E�@
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '��%';
-�b�P
-����������������������������������������
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��%';
-�b�P
-�E��������������������������������������
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��';
-�b�P
-����������������������������������������
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '�\%';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\%';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -317,6 +258,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_like_ucs2.result b/mysql-test/suite/jp/r/jp_like_ucs2.result
index 229ef12a118..5b0f5171b94 100644
--- a/mysql-test/suite/jp/r/jp_like_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_like_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -100,31 +94,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ')
-,('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('とどなにぬねのはばぱひびぴふぶぷへべぺほ')
-,('ぼぽまみむめもゃやゅゆょよらりるれろゎわ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 Ｃ１
  ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
@@ -335,76 +304,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 Ｃ１
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
-Ｃ１
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
-Ｃ１
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
-Ｃ１
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
-Ｃ１
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
-Ｃ１
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
-Ｃ１
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
-Ｃ１
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
-Ｃ１
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
-Ｃ１
-とどなにぬねのはばぱひびぴふぶぷへべぺほ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
-Ｃ１
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -414,6 +313,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_like_ujis.result b/mysql-test/suite/jp/r/jp_like_ujis.result
index 5d623df0384..a0cf0264dfb 100644
--- a/mysql-test/suite/jp/r/jp_like_ujis.result
+++ b/mysql-test/suite/jp/r/jp_like_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 Ｃ１
  !"#$%&'()*+,-./
@@ -258,56 +249,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 Ｃ１
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
-Ｃ１
- !"#$%&'()*+,-./
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
-Ｃ１
- !"#$%&'()*+,-./
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
-Ｃ１
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
-Ｃ１
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
-Ｃ１
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
-Ｃ１
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
-Ｃ１
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
-Ｃ１
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
-Ｃ１
-とどなにぬねのはばぱひびぴふぶぷへべぺほ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
-Ｃ１
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -317,6 +258,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_like_utf8.result b/mysql-test/suite/jp/r/jp_like_utf8.result
index bf48da79951..2ac95ba4d6a 100644
--- a/mysql-test/suite/jp/r/jp_like_utf8.result
+++ b/mysql-test/suite/jp/r/jp_like_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE ' %';
 鐚ｏ��
  !"#$%&'()*+,-./
@@ -258,53 +249,6 @@ SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠�
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 鐚ｏ��
 藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE ' %';
-鐚ｏ��
- !"#$%&'()*+,-./
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '% %';
-鐚ｏ��
- !"#$%&'()*+,-./
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '% ';
-鐚ｏ��
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '鐓�%';
-鐚ｏ��
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐓�鐓�%';
-鐚ｏ��
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐔�';
-鐚ｏ��
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '���%';
-鐚ｏ��
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���%';
-鐚ｏ��
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���';
-鐚ｏ��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '���%';
-鐚ｏ��
-��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���%';
-鐚ｏ��
-��祉��������������������������������������������������������
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���';
-鐚ｏ��
-��若�純�障�帥�����������������������������������������������
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '藜�%';
-鐚ｏ��
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藜�%';
-鐚ｏ��
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藹�';
-鐚ｏ��
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -314,6 +258,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_locate_sjis.result b/mysql-test/suite/jp/r/jp_locate_sjis.result
index b2455401db8..623d1388673 100644
--- a/mysql-test/suite/jp/r/jp_locate_sjis.result
+++ b/mysql-test/suite/jp/r/jp_locate_sjis.result
@@ -7,7 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -31,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 SELECT LOCATE('�',`�b�P`) from `�s�P`;
 LOCATE('�',`�b�P`)
 1
@@ -196,60 +189,6 @@ LOCATE('�\',`�b�P`)
 SELECT LOCATE('�\',`�b�P`) from `�s�X`;
 LOCATE('�\',`�b�P`)
 0
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-1
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-2
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-3
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-4
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-5
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-LOCATE('�',`�b�P`)
-0
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-1
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-2
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-3
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-4
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-5
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-LOCATE('��',`�b�P`)
-0
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-1
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-2
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-3
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-4
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-5
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-LOCATE('�\',`�b�P`)
-0
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -259,6 +198,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_locate_ucs2.result b/mysql-test/suite/jp/r/jp_locate_ucs2.result
index 37b219b3335..357f1c235b5 100644
--- a/mysql-test/suite/jp/r/jp_locate_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_locate_ucs2.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -17,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -32,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
 LOCATE('ｱ',`Ｃ１`)
 1
@@ -197,60 +190,6 @@ LOCATE('龡',`Ｃ１`)
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
 LOCATE('丂',`Ｃ１`)
 0
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｱ',`Ｃ１`)
-1
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｲ',`Ｃ１`)
-2
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｳ',`Ｃ１`)
-3
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｴ',`Ｃ１`)
-4
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｵ',`Ｃ１`)
-5
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ﾝ',`Ｃ１`)
-0
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-LOCATE('あ',`Ｃ１`)
-1
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-LOCATE('い',`Ｃ１`)
-2
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-LOCATE('う',`Ｃ１`)
-3
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-LOCATE('え',`Ｃ１`)
-4
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-LOCATE('お',`Ｃ１`)
-5
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-LOCATE('ん',`Ｃ１`)
-0
-SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龔',`Ｃ１`)
-1
-SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龖',`Ｃ１`)
-2
-SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龗',`Ｃ１`)
-3
-SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龞',`Ｃ１`)
-4
-SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龡',`Ｃ１`)
-5
-SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`;
-LOCATE('丂',`Ｃ１`)
-0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -260,6 +199,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_locate_ujis.result b/mysql-test/suite/jp/r/jp_locate_ujis.result
index d139fa9203c..45560d2f331 100644
--- a/mysql-test/suite/jp/r/jp_locate_ujis.result
+++ b/mysql-test/suite/jp/r/jp_locate_ujis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -31,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
 LOCATE('ｱ',`Ｃ１`)
 1
@@ -196,60 +189,6 @@ LOCATE('龡',`Ｃ１`)
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
 LOCATE('丂',`Ｃ１`)
 0
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｱ',`Ｃ１`)
-1
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｲ',`Ｃ１`)
-2
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｳ',`Ｃ１`)
-3
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｴ',`Ｃ１`)
-4
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｵ',`Ｃ１`)
-5
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ﾝ',`Ｃ１`)
-0
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-LOCATE('あ',`Ｃ１`)
-1
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-LOCATE('い',`Ｃ１`)
-2
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-LOCATE('う',`Ｃ１`)
-3
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-LOCATE('え',`Ｃ１`)
-4
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-LOCATE('お',`Ｃ１`)
-5
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-LOCATE('ん',`Ｃ１`)
-0
-SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龔',`Ｃ１`)
-1
-SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龖',`Ｃ１`)
-2
-SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龗',`Ｃ１`)
-3
-SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龞',`Ｃ１`)
-4
-SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`;
-LOCATE('龡',`Ｃ１`)
-5
-SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`;
-LOCATE('丂',`Ｃ１`)
-0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_locate_utf8.result b/mysql-test/suite/jp/r/jp_locate_utf8.result
index a1ce9e8d2dc..162d03e6056 100644
--- a/mysql-test/suite/jp/r/jp_locate_utf8.result
+++ b/mysql-test/suite/jp/r/jp_locate_utf8.result
@@ -7,7 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -31,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��`;
 LOCATE('鐔�',`鐚ｏ��`)
 1
@@ -196,60 +189,6 @@ LOCATE('蘊�',`鐚ｏ��`)
 SELECT LOCATE('筝�',`鐚ｏ��`) from `鐚器��`;
 LOCATE('筝�',`鐚ｏ��`)
 0
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐔�',`鐚ｏ��`)
-1
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐔�',`鐚ｏ��`)
-2
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐔�',`鐚ｏ��`)
-3
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐔�',`鐚ｏ��`)
-4
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐔�',`鐚ｏ��`)
-5
-SELECT LOCATE('鐓�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('鐓�',`鐚ｏ��`)
-0
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-1
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-2
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-3
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-4
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-5
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('���',`鐚ｏ��`)
-0
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('蘊�',`鐚ｏ��`)
-1
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('蘊�',`鐚ｏ��`)
-2
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('蘊�',`鐚ｏ��`)
-3
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('蘊�',`鐚ｏ��`)
-4
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('蘊�',`鐚ｏ��`)
-5
-SELECT LOCATE('筝�',`鐚ｏ��`) from `鐚器��鐚�`;
-LOCATE('筝�',`鐚ｏ��`)
-0
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -259,6 +198,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_lpad_sjis.result b/mysql-test/suite/jp/r/jp_lpad_sjis.result
index b45427ebf3d..46cbde52192 100644
--- a/mysql-test/suite/jp/r/jp_lpad_sjis.result
+++ b/mysql-test/suite/jp/r/jp_lpad_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�P`;
 �b�P	LPAD(`�b�P`,5,'�')
 	　　�
@@ -108,30 +99,6 @@ SELECT `�b�P`, LPAD(`�b�P`,5,'�\' ) FROM `�s�X`;
 �\�\	�\�\�\�\�\
 �\	�\�\�\�\�\
 	�\�\�\�\�\
-SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�P�O`;
-�b�P	LPAD(`�b�P`,5,'�')
-渦慨�	渦慨�
-渦慨	￣桶�
-渦�	　渦�
-渦	　￣�
-�	　　�
-	　　�
-SELECT `�b�P`, LPAD(`�b�P`,5,'�w') FROM `�s�P�P`;
-�b�P	LPAD(`�b�P`,5,'�w')
-����������	����������
-��������	�w��������
-������	�w�w������
-����	�w�w�w����
-��	�w�w�w�w��
-	�w�w�w�w�w
-SELECT `�b�P`, LPAD(`�b�P`,5,'�\' ) FROM `�s�P�Q`;
-�b�P	LPAD(`�b�P`,5,'�\' )
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\�\
-�\�\�\	�\�\�\�\�\
-�\�\	�\�\�\�\�\
-�\	�\�\�\�\�\
-	�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -141,6 +108,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_lpad_ucs2.result b/mysql-test/suite/jp/r/jp_lpad_ucs2.result
index 951c5508a8f..f5ba98db3f3 100644
--- a/mysql-test/suite/jp/r/jp_lpad_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_lpad_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
 Ｃ１	LPAD(`Ｃ１`,5,'｡')
 	｡｡｡｡｡
@@ -109,30 +100,6 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 龔龖	丄丄丄龔龖
 龔	丄丄丄丄龔
 	丄丄丄丄丄
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-Ｃ１	LPAD(`Ｃ１`,5,'｡')
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	｡ｱｲｳｴ
-ｱｲｳ	｡｡ｱｲｳ
-ｱｲ	｡｡｡ｱｲ
-ｱ	｡｡｡｡ｱ
-	｡｡｡｡｡
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-Ｃ１	LPAD(`Ｃ１`,5,'Ｘ')
-あいうえお	あいうえお
-あいうえ	Ｘあいうえ
-あいう	ＸＸあいう
-あい	ＸＸＸあい
-あ	ＸＸＸＸあ
-	ＸＸＸＸＸ
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-Ｃ１	LPAD(`Ｃ１`,5,'丄' )
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	丄龔龖龗龞
-龔龖龗	丄丄龔龖龗
-龔龖	丄丄丄龔龖
-龔	丄丄丄丄龔
-	丄丄丄丄丄
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -142,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_lpad_ujis.result b/mysql-test/suite/jp/r/jp_lpad_ujis.result
index 945e513d066..c95f0e2f261 100644
--- a/mysql-test/suite/jp/r/jp_lpad_ujis.result
+++ b/mysql-test/suite/jp/r/jp_lpad_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
 Ｃ１	LPAD(`Ｃ１`,5,'｡')
 	｡｡｡｡｡
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 龔龖	丄丄丄龔龖
 龔	丄丄丄丄龔
 	丄丄丄丄丄
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-Ｃ１	LPAD(`Ｃ１`,5,'｡')
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	｡ｱｲｳｴ
-ｱｲｳ	｡｡ｱｲｳ
-ｱｲ	｡｡｡ｱｲ
-ｱ	｡｡｡｡ｱ
-	｡｡｡｡｡
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-Ｃ１	LPAD(`Ｃ１`,5,'Ｘ')
-あいうえお	あいうえお
-あいうえ	Ｘあいうえ
-あいう	ＸＸあいう
-あい	ＸＸＸあい
-あ	ＸＸＸＸあ
-	ＸＸＸＸＸ
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-Ｃ１	LPAD(`Ｃ１`,5,'丄' )
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	丄龔龖龗龞
-龔龖龗	丄丄龔龖龗
-龔龖	丄丄丄龔龖
-龔	丄丄丄丄龔
-	丄丄丄丄丄
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_lpad_utf8.result b/mysql-test/suite/jp/r/jp_lpad_utf8.result
index 8a3bae0153e..150dfe61b13 100644
--- a/mysql-test/suite/jp/r/jp_lpad_utf8.result
+++ b/mysql-test/suite/jp/r/jp_lpad_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 鐚ｏ��	LPAD(`鐚ｏ��`,5,'鐔�')
 	鐔￥宗鐔￥宗鐔�
@@ -108,30 +99,6 @@ SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 蘊�蘊�	筝�筝�筝�蘊�蘊�
 蘊�	筝�筝�筝�筝�蘊�
 	筝�筝�筝�筝�筝�
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��鐚�`;
-鐚ｏ��	LPAD(`鐚ｏ��`,5,'鐔�')
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔￥襲鐔駕蹴鐔�
-鐔縁讐鐔�	鐔￥宗鐔縁讐鐔�
-鐔縁讐	鐔￥宗鐔￥襲鐔�
-鐔�	鐔￥宗鐔￥宗鐔�
-	鐔￥宗鐔￥宗鐔�
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��鐚�`;
-鐚ｏ��	LPAD(`鐚ｏ��`,5,'鐚�')
-���������������	���������������
-������������	鐚吾�����������
-���������	鐚醐叱���������
-������	鐚醐叱鐚吾�����
-���	鐚醐叱鐚醐叱���
-	鐚醐叱鐚醐叱鐚�
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��鐚�`;
-鐚ｏ��	LPAD(`鐚ｏ��`,5,'筝�' )
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	筝�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	筝�筝�蘊�蘊�蘊�
-蘊�蘊�	筝�筝�筝�蘊�蘊�
-蘊�	筝�筝�筝�筝�蘊�
-	筝�筝�筝�筝�筝�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -141,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_sjis.result b/mysql-test/suite/jp/r/jp_ltrim_sjis.result
index 23032d65c56..7a7902afe2d 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_sjis.result
@@ -7,7 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�P` VALUES (' 渦慨�');
 INSERT INTO `�s�P` VALUES ('  渦慨�');
@@ -85,27 +81,6 @@ INSERT INTO `�s�X` VALUES ('   �\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�@�\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�@�@�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES (' 渦慨�');
-INSERT INTO `�s�P�O` VALUES ('  渦慨�');
-INSERT INTO `�s�P�O` VALUES ('   渦慨�');
-INSERT INTO `�s�P�O` VALUES ('�@渦慨�');
-INSERT INTO `�s�P�O` VALUES ('�@�@渦慨�');
-INSERT INTO `�s�P�O` VALUES ('�@�@�@渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES (' ����������');
-INSERT INTO `�s�P�P` VALUES ('  ����������');
-INSERT INTO `�s�P�P` VALUES ('   ����������');
-INSERT INTO `�s�P�P` VALUES ('�@����������');
-INSERT INTO `�s�P�P` VALUES ('�@�@����������');
-INSERT INTO `�s�P�P` VALUES ('�@�@�@����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES (' �\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('  �\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('   �\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�@�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�@�@�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�@�@�@�\�\�\�\�\');
 SELECT LTRIM(`�b�P`) from `�s�P`;
 LTRIM(`�b�P`)
 渦慨�
@@ -187,33 +162,6 @@ LTRIM(`�b�P`)
 �@�\�\�\�\�\
 �@�@�\�\�\�\�\
 �@�@�@�\�\�\�\�\
-SELECT LTRIM(`�b�P`) from `�s�P�O`;
-LTRIM(`�b�P`)
-渦慨�
-渦慨�
-渦慨�
-渦慨�
-�@渦慨�
-�@�@渦慨�
-�@�@�@渦慨�
-SELECT LTRIM(`�b�P`) from `�s�P�P`;
-LTRIM(`�b�P`)
-����������
-����������
-����������
-����������
-�@����������
-�@�@����������
-�@�@�@����������
-SELECT LTRIM(`�b�P`) from `�s�P�Q`;
-LTRIM(`�b�P`)
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-�@�\�\�\�\�\
-�@�@�\�\�\�\�\
-�@�@�@�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -223,6 +171,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
index 533cf95a976..c46e917c933 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -17,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('  ｱｲｳｴｵ');
@@ -86,27 +82,6 @@ INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　　龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('  ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES (' あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('  あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　　あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('  龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　　龔龖龗龞龡');
 SELECT LTRIM(`Ｃ１`) from `Ｔ１`;
 LTRIM(`Ｃ１`)
 ｱｲｳｴｵ
@@ -188,33 +163,6 @@ LTRIM(`Ｃ１`)
 　龔龖龗龞龡
 　　龔龖龗龞龡
 　　　龔龖龗龞龡
-SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
-LTRIM(`Ｃ１`)
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-　ｱｲｳｴｵ
-　　ｱｲｳｴｵ
-　　　ｱｲｳｴｵ
-SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
-LTRIM(`Ｃ１`)
-あいうえお
-あいうえお
-あいうえお
-あいうえお
-　あいうえお
-　　あいうえお
-　　　あいうえお
-SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
-LTRIM(`Ｃ１`)
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-　龔龖龗龞龡
-　　龔龖龗龞龡
-　　　龔龖龗龞龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -224,6 +172,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_ujis.result b/mysql-test/suite/jp/r/jp_ltrim_ujis.result
index 1c95f28907f..f12444f284b 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_ujis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('  ｱｲｳｴｵ');
@@ -85,27 +81,6 @@ INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　　龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('  ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES (' あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('  あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　　あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('  龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　　龔龖龗龞龡');
 SELECT LTRIM(`Ｃ１`) from `Ｔ１`;
 LTRIM(`Ｃ１`)
 ｱｲｳｴｵ
@@ -187,33 +162,6 @@ LTRIM(`Ｃ１`)
 　龔龖龗龞龡
 　　龔龖龗龞龡
 　　　龔龖龗龞龡
-SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
-LTRIM(`Ｃ１`)
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-　ｱｲｳｴｵ
-　　ｱｲｳｴｵ
-　　　ｱｲｳｴｵ
-SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
-LTRIM(`Ｃ１`)
-あいうえお
-あいうえお
-あいうえお
-あいうえお
-　あいうえお
-　　あいうえお
-　　　あいうえお
-SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
-LTRIM(`Ｃ１`)
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-　龔龖龗龞龡
-　　龔龖龗龞龡
-　　　龔龖龗龞龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -223,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_utf8.result b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
index c6fae7233f1..9ca8d61b050 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
@@ -7,7 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES (' 鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('  鐔縁讐鐔鰹輯鐔�');
@@ -85,27 +81,6 @@ INSERT INTO `鐚器��` VALUES ('   蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('���蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('������蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('���������蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES (' 鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('  鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('   鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('������鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES (' ���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('  ���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('   ���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES (' 蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('  蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('   蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('���蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('������蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������蘊�蘊�蘊�蘊�蘊�');
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 LTRIM(`鐚ｏ��`)
 鐔縁讐鐔鰹輯鐔�
@@ -187,33 +162,6 @@ LTRIM(`鐚ｏ��`)
 ���蘊�蘊�蘊�蘊�蘊�
 ������蘊�蘊�蘊�蘊�蘊�
 ���������蘊�蘊�蘊�蘊�蘊�
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-LTRIM(`鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-���鐔縁讐鐔鰹輯鐔�
-������鐔縁讐鐔鰹輯鐔�
-���������鐔縁讐鐔鰹輯鐔�
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-LTRIM(`鐚ｏ��`)
-���������������
-���������������
-���������������
-���������������
-������������������
-���������������������
-������������������������
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-LTRIM(`鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-���蘊�蘊�蘊�蘊�蘊�
-������蘊�蘊�蘊�蘊�蘊�
-���������蘊�蘊�蘊�蘊�蘊�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -223,6 +171,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_ps_sjis.result b/mysql-test/suite/jp/r/jp_ps_sjis.result
index 2397bc78c5b..0990b30338c 100644
--- a/mysql-test/suite/jp/r/jp_ps_sjis.result
+++ b/mysql-test/suite/jp/r/jp_ps_sjis.result
@@ -446,14 +446,14 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
 CREATE TABLE t3(
 `�` char(1),
 `��` char(1),
 `�\` char(1)
-)DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP;
+)DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =MEMORY;
 INSERT INTO t1 VALUES ('xxx');
 INSERT INTO t2 VALUES ('����\');
 INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
@@ -667,230 +667,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t3(
-`�` char(1),
-`��` char(1),
-`�\` char(1)
-)DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB;
-INSERT INTO t1 VALUES ('xxx');
-INSERT INTO t2 VALUES ('����\');
-INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
-INSERT INTO t4 VALUES ('�'),('��'),('�\' );
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
-PREPARE stmt5 FROM 'SELECT CHARSET(?)';
-PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
-PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
-PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
-PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
-PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
-PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
-PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-SET @arg = '�';
-EXECUTE stmt1 USING @arg;
-?
-�
-�
-�
-�
-�
-�
-EXECUTE stmt2 USING @arg;
-�	��	�\
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-sjis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-�xx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-1
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-1
-EXECUTE stmt9 USING @arg;
-LPAD(c1,10,?)
-臼臼臼�xxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-x���\
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-臼�
-EXECUTE stmt12 USING @arg;
-RPAD(c1,10,?)
-xxx臼臼臼�
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-�	��	�\
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-�	��	�\
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-SET @arg = '��';
-EXECUTE stmt1 USING @arg;
-?
-��
-��
-��
-��
-��
-��
-EXECUTE stmt2 USING @arg;
-�	��	�\
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-sjis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-��xx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-2
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-2
-EXECUTE stmt9 USING @arg;
-LPAD(c1,10,?)
-��������������xxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-�x�\
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-������
-EXECUTE stmt12 USING @arg;
-RPAD(c1,10,?)
-xxx��������������
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-�
-x
-�\
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-�
-��
-�\
-SET @arg = '�\';
-EXECUTE stmt1 USING @arg;
-?
-�\
-�\
-�\
-�\
-�\
-�\
-EXECUTE stmt2 USING @arg;
-�	��	�\
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-sjis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-�\xx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-3
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-3
-EXECUTE stmt9 USING @arg;
-LPAD(c1,10,?)
-�\�\�\�\�\�\�\xxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-���x
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-�\�\�\
-EXECUTE stmt12 USING @arg;
-RPAD(c1,10,?)
-xxx�\�\�\�\�\�\�\
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-�
-��
-x
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-�
-��
-�\
-DEALLOCATE PREPARE stmt1;
-DEALLOCATE PREPARE stmt2;
-DEALLOCATE PREPARE stmt3;
-DEALLOCATE PREPARE stmt4;
-DEALLOCATE PREPARE stmt5;
-DEALLOCATE PREPARE stmt6;
-DEALLOCATE PREPARE stmt7;
-DEALLOCATE PREPARE stmt8;
-DEALLOCATE PREPARE stmt9;
-DEALLOCATE PREPARE stmt10;
-DEALLOCATE PREPARE stmt11;
-DEALLOCATE PREPARE stmt12;
-DEALLOCATE PREPARE stmt13;
-DEALLOCATE PREPARE stmt14;
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
diff --git a/mysql-test/suite/jp/r/jp_ps_ujis.result b/mysql-test/suite/jp/r/jp_ps_ujis.result
index 9afef7f76d1..d226b0ef03b 100644
--- a/mysql-test/suite/jp/r/jp_ps_ujis.result
+++ b/mysql-test/suite/jp/r/jp_ps_ujis.result
@@ -446,14 +446,14 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
 CREATE TABLE t3(
 `ｱ` char(1),
 `あ` char(1),
 `龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP;
+)DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =MEMORY;
 INSERT INTO t1 VALUES ('xxx');
 INSERT INTO t2 VALUES ('ｱあ龔');
 INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
@@ -667,230 +667,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t3(
-`ｱ` char(1),
-`あ` char(1),
-`龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = BDB;
-INSERT INTO t1 VALUES ('xxx');
-INSERT INTO t2 VALUES ('ｱあ龔');
-INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
-INSERT INTO t4 VALUES ('ｱ'),('あ'),('龔' );
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
-PREPARE stmt5 FROM 'SELECT CHARSET(?)';
-PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
-PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
-PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
-PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
-PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
-PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
-PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-SET @arg = 'ｱ';
-EXECUTE stmt1 USING @arg;
-?
-ｱ
-ｱ
-ｱ
-ｱ
-ｱ
-ｱ
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-ｱxx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-1
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-1
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-ｱｱｱｱｱｱxxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-xあ龔
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-ｱｱｱ
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxxｱｱｱｱｱｱ
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-SET @arg = 'あ';
-EXECUTE stmt1 USING @arg;
-?
-あ
-あ
-あ
-あ
-あ
-あ
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-あxx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-2
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-2
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-ああああああxxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-ｱx龔
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-あああ
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxxああああああ
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-x
-龔
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-龔
-SET @arg = '龔';
-EXECUTE stmt1 USING @arg;
-?
-龔
-龔
-龔
-龔
-龔
-龔
-EXECUTE stmt2 USING @arg;
-ｱ	あ	龔
-x	x	x
-x	x	x
-y	y	y
-y	y	y
-z	z	z
-z	z	z
-EXECUTE stmt3 USING @arg;
-COUNT(*)
-6
-EXECUTE stmt4 USING @arg;
-CHAR_LENGTH(?)
-1
-EXECUTE stmt5 USING @arg;
-CHARSET(?)
-ujis
-EXECUTE stmt6 USING @arg;
-INSERT(c1,1,1,?)
-龔xx
-EXECUTE stmt7 USING @arg;
-INSTR(c1,?)
-3
-EXECUTE stmt8 USING @arg;
-LOCATE(?,c1)
-3
-EXECUTE stmt9 USING @arg;
-LPAD(c1,9,?)
-龔龔龔龔龔龔xxx
-EXECUTE stmt10 USING @arg;
-REPLACE(c1,?,'x')
-ｱあx
-EXECUTE stmt11 USING @arg;
-REPLACE(c1,'x',?)
-龔龔龔
-EXECUTE stmt12 USING @arg;
-RPAD(c1,9,?)
-xxx龔龔龔龔龔龔
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-x
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-c1
-ｱ
-あ
-龔
-DEALLOCATE PREPARE stmt1;
-DEALLOCATE PREPARE stmt2;
-DEALLOCATE PREPARE stmt3;
-DEALLOCATE PREPARE stmt4;
-DEALLOCATE PREPARE stmt5;
-DEALLOCATE PREPARE stmt6;
-DEALLOCATE PREPARE stmt7;
-DEALLOCATE PREPARE stmt8;
-DEALLOCATE PREPARE stmt9;
-DEALLOCATE PREPARE stmt10;
-DEALLOCATE PREPARE stmt11;
-DEALLOCATE PREPARE stmt12;
-DEALLOCATE PREPARE stmt13;
-DEALLOCATE PREPARE stmt14;
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
diff --git a/mysql-test/suite/jp/r/jp_replace_sjis.result b/mysql-test/suite/jp/r/jp_replace_sjis.result
index 08e45968fdd..b8daf59540c 100644
--- a/mysql-test/suite/jp/r/jp_replace_sjis.result
+++ b/mysql-test/suite/jp/r/jp_replace_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 SELECT REPLACE(`�b�P`,'�','臼') FROM `�s�P`;
 REPLACE(`�b�P`,'�','臼')
 臼桶患
@@ -171,51 +162,6 @@ REPLACE(`�b�P`,'�\','�\�\')
 SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�X`;
 REPLACE(`�b�P`,'�\','�\�\')
 �\�\�\�\�\�\
-SELECT REPLACE(`�b�P`,'�','臼') FROM `�s�P�O`;
-REPLACE(`�b�P`,'�','臼')
-臼桶患
-SELECT REPLACE(`�b�P`,'�','臆') FROM `�s�P�O`;
-REPLACE(`�b�P`,'�','臆')
-渦桶患
-SELECT REPLACE(`�b�P`,'�','崖') FROM `�s�P�O`;
-REPLACE(`�b�P`,'�','崖')
-渦崖患
-SELECT REPLACE(`�b�P`,'�','幹') FROM `�s�P�O`;
-REPLACE(`�b�P`,'�','幹')
-渦慨患
-SELECT REPLACE(`�b�P`,'�','亀') FROM `�s�P�O`;
-REPLACE(`�b�P`,'�','亀')
-渦慨亀
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-REPLACE(`�b�P`,'��','����')
-������������
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-REPLACE(`�b�P`,'��','����')
-������������
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-REPLACE(`�b�P`,'��','����')
-������������
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-REPLACE(`�b�P`,'��','����')
-������������
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-REPLACE(`�b�P`,'��','����')
-������������
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-REPLACE(`�b�P`,'�\','�\�\')
-�\�\�\�\�\�\
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-REPLACE(`�b�P`,'�\','�\�\')
-�\�\�\�\�\�\
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-REPLACE(`�b�P`,'�\','�\�\')
-�\�\�\�\�\�\
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-REPLACE(`�b�P`,'�\','�\�\')
-�\�\�\�\�\�\
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-REPLACE(`�b�P`,'�\','�\�\')
-�\�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -225,6 +171,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_replace_ucs2.result b/mysql-test/suite/jp/r/jp_replace_ucs2.result
index 2911fe69b9a..2390e88d82f 100644
--- a/mysql-test/suite/jp/r/jp_replace_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_replace_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
 REPLACE(`Ｃ１`,'ｱ','ｱｱ')
 ｱｱｲｳｴｵ
@@ -172,51 +163,6 @@ REPLACE(`Ｃ１`,'龞','龞龞')
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`;
 REPLACE(`Ｃ１`,'龡','龡龡')
 龔龖龗龞龡龡
-SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｱ','ｱｱ')
-ｱｱｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｲ','ｲｲ')
-ｱｲｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｳ','ｳｳ')
-ｱｲｳｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｴ','ｴｴ')
-ｱｲｳｴｴｵ
-SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｵ','ｵｵ')
-ｱｲｳｴｵｵ
-SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'あ','ああ')
-ああいうえお
-SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'い','いい')
-あいいうえお
-SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'う','うう')
-あいううえお
-SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'え','ええ')
-あいうええお
-SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'お','おお')
-あいうえおお
-SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龔','龔龔')
-龔龔龖龗龞龡
-SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龖','龖龖')
-龔龖龖龗龞龡
-SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龗','龗龗')
-龔龖龗龗龞龡
-SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龞','龞龞')
-龔龖龗龞龞龡
-SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龡','龡龡')
-龔龖龗龞龡龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -226,6 +172,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_replace_ujis.result b/mysql-test/suite/jp/r/jp_replace_ujis.result
index 7f776804ee9..b3ef6c28130 100644
--- a/mysql-test/suite/jp/r/jp_replace_ujis.result
+++ b/mysql-test/suite/jp/r/jp_replace_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
 REPLACE(`Ｃ１`,'ｱ','ｱｱ')
 ｱｱｲｳｴｵ
@@ -171,51 +162,6 @@ REPLACE(`Ｃ１`,'龞','龞龞')
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`;
 REPLACE(`Ｃ１`,'龡','龡龡')
 龔龖龗龞龡龡
-SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｱ','ｱｱ')
-ｱｱｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｲ','ｲｲ')
-ｱｲｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｳ','ｳｳ')
-ｱｲｳｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｴ','ｴｴ')
-ｱｲｳｴｴｵ
-SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｵ','ｵｵ')
-ｱｲｳｴｵｵ
-SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'あ','ああ')
-ああいうえお
-SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'い','いい')
-あいいうえお
-SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'う','うう')
-あいううえお
-SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'え','ええ')
-あいうええお
-SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'お','おお')
-あいうえおお
-SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龔','龔龔')
-龔龔龖龗龞龡
-SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龖','龖龖')
-龔龖龖龗龞龡
-SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龗','龗龗')
-龔龖龗龗龞龡
-SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龞','龞龞')
-龔龖龗龞龞龡
-SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'龡','龡龡')
-龔龖龗龞龡龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -225,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_replace_utf8.result b/mysql-test/suite/jp/r/jp_replace_utf8.result
index 16981fcd0d8..734e1e3d6a9 100644
--- a/mysql-test/suite/jp/r/jp_replace_utf8.result
+++ b/mysql-test/suite/jp/r/jp_replace_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲') FROM `鐚器��`;
 REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲')
 鐔縁襲鐔駕蹴鐔器週
@@ -171,51 +162,6 @@ REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�')
 SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝') FROM `鐚器��`;
 REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝')
 蘊�蘊�蘊�蘊�蘊♂勝
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲')
-鐔縁襲鐔駕蹴鐔器週
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔駕讐') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'鐔�','鐔駕讐')
-鐔縁讐鐔駕蹴鐔器週
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔鰹蹴') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'鐔�','鐔鰹蹴')
-鐔縁讐鐔鰹蹴鐔器週
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔器輯') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'鐔�','鐔器輯')
-鐔縁讐鐔鰹輯鐔器週
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔居週') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'鐔�','鐔居週')
-鐔縁讐鐔鰹輯鐔居週
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'���','������')
-������������������
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'���','������')
-������������������
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'���','������')
-������������������
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'���','������')
-������������������
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'���','������')
-������������������
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�')
-蘊�蘊�蘊�蘊�蘊�蘊�
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�')
-蘊�蘊�蘊�蘊�蘊�蘊�
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�')
-蘊�蘊�蘊�蘊�蘊�蘊�
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�')
-蘊�蘊�蘊�蘊�蘊�蘊�
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝') FROM `鐚器��鐚�`;
-REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝')
-蘊�蘊�蘊�蘊�蘊♂勝
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -225,6 +171,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_reverse_sjis.result b/mysql-test/suite/jp/r/jp_reverse_sjis.result
index 76cf9d6b571..95c8cb76217 100644
--- a/mysql-test/suite/jp/r/jp_reverse_sjis.result
+++ b/mysql-test/suite/jp/r/jp_reverse_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 SELECT REVERSE(`�b�P`) FROM `�s�P`;
 REVERSE(`�b�P`)
 鬼害�
@@ -63,15 +54,6 @@ REVERSE(`�b�P`)
 SELECT REVERSE(`�b�P`) FROM `�s�X`;
 REVERSE(`�b�P`)
 �\�\�\�\�\
-SELECT REVERSE(`�b�P`) FROM `�s�P�O`;
-REVERSE(`�b�P`)
-鬼害�
-SELECT REVERSE(`�b�P`) FROM `�s�P�P`;
-REVERSE(`�b�P`)
-����������
-SELECT REVERSE(`�b�P`) FROM `�s�P�Q`;
-REVERSE(`�b�P`)
-�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -81,6 +63,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_reverse_ucs2.result b/mysql-test/suite/jp/r/jp_reverse_ucs2.result
index ad9782d5048..9da7f5d7b59 100644
--- a/mysql-test/suite/jp/r/jp_reverse_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_reverse_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`;
 REVERSE(`Ｃ１`)
 ｵｴｳｲｱ
@@ -64,15 +55,6 @@ REVERSE(`Ｃ１`)
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`;
 REVERSE(`Ｃ１`)
 龡龞龗龖龔
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`;
-REVERSE(`Ｃ１`)
-ｵｴｳｲｱ
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`;
-REVERSE(`Ｃ１`)
-おえういあ
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`;
-REVERSE(`Ｃ１`)
-龡龞龗龖龔
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -82,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_reverse_ujis.result b/mysql-test/suite/jp/r/jp_reverse_ujis.result
index 888f7f9e054..67ba5a10b00 100644
--- a/mysql-test/suite/jp/r/jp_reverse_ujis.result
+++ b/mysql-test/suite/jp/r/jp_reverse_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`;
 REVERSE(`Ｃ１`)
 ｵｴｳｲｱ
@@ -63,15 +54,6 @@ REVERSE(`Ｃ１`)
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`;
 REVERSE(`Ｃ１`)
 龡龞龗龖龔
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`;
-REVERSE(`Ｃ１`)
-ｵｴｳｲｱ
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`;
-REVERSE(`Ｃ１`)
-おえういあ
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`;
-REVERSE(`Ｃ１`)
-龡龞龗龖龔
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -81,6 +63,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_reverse_utf8.result b/mysql-test/suite/jp/r/jp_reverse_utf8.result
index 4e02cf69645..8ff7afb7e71 100644
--- a/mysql-test/suite/jp/r/jp_reverse_utf8.result
+++ b/mysql-test/suite/jp/r/jp_reverse_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 REVERSE(`鐚ｏ��`)
 鐔居輯鐔鰹讐鐔�
@@ -63,15 +54,6 @@ REVERSE(`鐚ｏ��`)
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 REVERSE(`鐚ｏ��`)
 蘊♂��蘊�蘊�蘊�
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-REVERSE(`鐚ｏ��`)
-鐔居輯鐔鰹讐鐔�
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-REVERSE(`鐚ｏ��`)
-���������������
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-REVERSE(`鐚ｏ��`)
-蘊♂��蘊�蘊�蘊�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -81,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_right_sjis.result b/mysql-test/suite/jp/r/jp_right_sjis.result
index 249d7bbb0bc..332f8b077dd 100644
--- a/mysql-test/suite/jp/r/jp_right_sjis.result
+++ b/mysql-test/suite/jp/r/jp_right_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P`;
 �b�P	RIGHT(`�b�P`,0)
 	
@@ -468,150 +459,6 @@ SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�X`;
 �\�\	�\�\
 �\	�\
 	
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,1)
-渦慨�	�
-渦慨	�
-渦�	�
-渦	�
-�	�
-	
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,2)
-渦慨�	患
-渦慨	慨
-渦�	桶
-渦	渦
-�	�
-	
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,3)
-渦慨�	慨�
-渦慨	桶�
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,4)
-渦慨�	桶患
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�O`;
-�b�P	RIGHT(`�b�P`,5)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,1)
-����������	��
-��������	��
-������	��
-����	��
-��	��
-	
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,2)
-����������	����
-��������	����
-������	����
-����	����
-��	��
-	
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,3)
-����������	������
-��������	������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,4)
-����������	��������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�P`;
-�b�P	RIGHT(`�b�P`,5)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,1)
-�\�\�\�\�\	�\
-�\�\�\�\	�\
-�\�\�\	�\
-�\�\	�\
-�\	�\
-	
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,2)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,4)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�Q`;
-�b�P	RIGHT(`�b�P`,5)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -621,6 +468,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_right_ucs2.result b/mysql-test/suite/jp/r/jp_right_ucs2.result
index a8a3fba0f92..e2e594b9340 100644
--- a/mysql-test/suite/jp/r/jp_right_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_right_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
 Ｃ１	RIGHT(`Ｃ１`,0)
 	
@@ -469,150 +460,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-ｱｲｳｴｵ	ｵ
-ｱｲｳｴ	ｴ
-ｱｲｳ	ｳ
-ｱｲ	ｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-ｱｲｳｴｵ	ｴｵ
-ｱｲｳｴ	ｳｴ
-ｱｲｳ	ｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-ｱｲｳｴｵ	ｳｴｵ
-ｱｲｳｴ	ｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-ｱｲｳｴｵ	ｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-あいうえお	お
-あいうえ	え
-あいう	う
-あい	い
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-あいうえお	えお
-あいうえ	うえ
-あいう	いう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-あいうえお	うえお
-あいうえ	いうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-あいうえお	いうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-龔龖龗龞龡	龡
-龔龖龗龞	龞
-龔龖龗	龗
-龔龖	龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-龔龖龗龞龡	龞龡
-龔龖龗龞	龗龞
-龔龖龗	龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-龔龖龗龞龡	龗龞龡
-龔龖龗龞	龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-龔龖龗龞龡	龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -622,6 +469,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_right_ujis.result b/mysql-test/suite/jp/r/jp_right_ujis.result
index bb182853d95..d5d2cda036f 100644
--- a/mysql-test/suite/jp/r/jp_right_ujis.result
+++ b/mysql-test/suite/jp/r/jp_right_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
 Ｃ１	RIGHT(`Ｃ１`,0)
 	
@@ -468,150 +459,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-ｱｲｳｴｵ	ｵ
-ｱｲｳｴ	ｴ
-ｱｲｳ	ｳ
-ｱｲ	ｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-ｱｲｳｴｵ	ｴｵ
-ｱｲｳｴ	ｳｴ
-ｱｲｳ	ｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-ｱｲｳｴｵ	ｳｴｵ
-ｱｲｳｴ	ｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-ｱｲｳｴｵ	ｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-あいうえお	お
-あいうえ	え
-あいう	う
-あい	い
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-あいうえお	えお
-あいうえ	うえ
-あいう	いう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-あいうえお	うえお
-あいうえ	いうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-あいうえお	いうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,1)
-龔龖龗龞龡	龡
-龔龖龗龞	龞
-龔龖龗	龗
-龔龖	龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,2)
-龔龖龗龞龡	龞龡
-龔龖龗龞	龗龞
-龔龖龗	龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,3)
-龔龖龗龞龡	龗龞龡
-龔龖龗龞	龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,4)
-龔龖龗龞龡	龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
-Ｃ１	RIGHT(`Ｃ１`,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -621,6 +468,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_right_utf8.result b/mysql-test/suite/jp/r/jp_right_utf8.result
index 50ba18ce3c4..e0b5c847956 100644
--- a/mysql-test/suite/jp/r/jp_right_utf8.result
+++ b/mysql-test/suite/jp/r/jp_right_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��`;
 鐚ｏ��	RIGHT(`鐚ｏ��`,0)
 	
@@ -468,150 +459,6 @@ SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��`;
 蘊�蘊�	蘊�蘊�
 蘊�	蘊�
 	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,1)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	鐔�
-鐔縁讐	鐔�
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,2)
-鐔縁讐鐔鰹輯鐔�	鐔器週
-鐔縁讐鐔鰹輯	鐔鰹輯
-鐔縁讐鐔�	鐔駕蹴
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,3)
-鐔縁讐鐔鰹輯鐔�	鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔駕蹴鐔�
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,4)
-鐔縁讐鐔鰹輯鐔�	鐔駕蹴鐔器週
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,5)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,1)
-���������������	���
-������������	���
-���������	���
-������	���
-���	���
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,2)
-���������������	������
-������������	������
-���������	������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,3)
-���������������	���������
-������������	���������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,4)
-���������������	������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,5)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,1)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	RIGHT(`鐚ｏ��`,5)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -621,6 +468,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_rpad_sjis.result b/mysql-test/suite/jp/r/jp_rpad_sjis.result
index 9c61c200672..906bbc4680d 100644
--- a/mysql-test/suite/jp/r/jp_rpad_sjis.result
+++ b/mysql-test/suite/jp/r/jp_rpad_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�P`;
 �b�P	RPAD(`�b�P`,5,'�')
 	　　�
@@ -108,30 +99,6 @@ SELECT `�b�P`, RPAD(`�b�P`,5,'�\' ) FROM `�s�X`;
 �\�\	�\�\�\�\�\
 �\	�\�\�\�\�\
 	�\�\�\�\�\
-SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�P�O`;
-�b�P	RPAD(`�b�P`,5,'�')
-渦慨�	渦慨�
-渦慨	渦慨�
-渦�	渦魁�
-渦	渦　�
-�	院　�
-	　　�
-SELECT `�b�P`, RPAD(`�b�P`,5,'�w') FROM `�s�P�P`;
-�b�P	RPAD(`�b�P`,5,'�w')
-����������	����������
-��������	���������w
-������	�������w�w
-����	�����w�w�w
-��	���w�w�w�w
-	�w�w�w�w�w
-SELECT `�b�P`, RPAD(`�b�P`,5,'�\' ) FROM `�s�P�Q`;
-�b�P	RPAD(`�b�P`,5,'�\' )
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\�\
-�\�\�\	�\�\�\�\�\
-�\�\	�\�\�\�\�\
-�\	�\�\�\�\�\
-	�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -141,6 +108,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_rpad_ucs2.result b/mysql-test/suite/jp/r/jp_rpad_ucs2.result
index b9df4cf6783..c3cbd1540ae 100644
--- a/mysql-test/suite/jp/r/jp_rpad_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_rpad_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
 Ｃ１	RPAD(`Ｃ１`,5,'｡')
 	｡｡｡｡｡
@@ -109,30 +100,6 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 龔龖	龔龖丄丄丄
 龔	龔丄丄丄丄
 	丄丄丄丄丄
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-Ｃ１	RPAD(`Ｃ１`,5,'｡')
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ｡
-ｱｲｳ	ｱｲｳ｡｡
-ｱｲ	ｱｲ｡｡｡
-ｱ	ｱ｡｡｡｡
-	｡｡｡｡｡
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-Ｃ１	RPAD(`Ｃ１`,5,'Ｘ')
-あいうえお	あいうえお
-あいうえ	あいうえＸ
-あいう	あいうＸＸ
-あい	あいＸＸＸ
-あ	あＸＸＸＸ
-	ＸＸＸＸＸ
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-Ｃ１	RPAD(`Ｃ１`,5,'丄' )
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞丄
-龔龖龗	龔龖龗丄丄
-龔龖	龔龖丄丄丄
-龔	龔丄丄丄丄
-	丄丄丄丄丄
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -142,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_rpad_ujis.result b/mysql-test/suite/jp/r/jp_rpad_ujis.result
index 3183b4f5fcd..38beef83591 100644
--- a/mysql-test/suite/jp/r/jp_rpad_ujis.result
+++ b/mysql-test/suite/jp/r/jp_rpad_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
 Ｃ１	RPAD(`Ｃ１`,5,'｡')
 	｡｡｡｡｡
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 龔龖	龔龖丄丄丄
 龔	龔丄丄丄丄
 	丄丄丄丄丄
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-Ｃ１	RPAD(`Ｃ１`,5,'｡')
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ｡
-ｱｲｳ	ｱｲｳ｡｡
-ｱｲ	ｱｲ｡｡｡
-ｱ	ｱ｡｡｡｡
-	｡｡｡｡｡
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-Ｃ１	RPAD(`Ｃ１`,5,'Ｘ')
-あいうえお	あいうえお
-あいうえ	あいうえＸ
-あいう	あいうＸＸ
-あい	あいＸＸＸ
-あ	あＸＸＸＸ
-	ＸＸＸＸＸ
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-Ｃ１	RPAD(`Ｃ１`,5,'丄' )
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞丄
-龔龖龗	龔龖龗丄丄
-龔龖	龔龖丄丄丄
-龔	龔丄丄丄丄
-	丄丄丄丄丄
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_rpad_utf8.result b/mysql-test/suite/jp/r/jp_rpad_utf8.result
index c482a058bd8..c2d65a3c953 100644
--- a/mysql-test/suite/jp/r/jp_rpad_utf8.result
+++ b/mysql-test/suite/jp/r/jp_rpad_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 鐚ｏ��	RPAD(`鐚ｏ��`,5,'鐔�')
 	鐔￥宗鐔￥宗鐔�
@@ -108,30 +99,6 @@ SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 蘊�蘊�	蘊�蘊�筝�筝�筝�
 蘊�	蘊�筝�筝�筝�筝�
 	筝�筝�筝�筝�筝�
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��鐚�`;
-鐚ｏ��	RPAD(`鐚ｏ��`,5,'鐔�')
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔�	鐔縁讐鐔鰹宗鐔�
-鐔縁讐	鐔縁讐鐔￥宗鐔�
-鐔�	鐔縁宗鐔￥宗鐔�
-	鐔￥宗鐔￥宗鐔�
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��鐚�`;
-鐚ｏ��	RPAD(`鐚ｏ��`,5,'鐚�')
-���������������	���������������
-������������	������������鐚�
-���������	���������鐚醐叱
-������	������鐚醐叱鐚�
-���	���鐚醐叱鐚醐叱
-	鐚醐叱鐚醐叱鐚�
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��鐚�`;
-鐚ｏ��	RPAD(`鐚ｏ��`,5,'筝�' )
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�筝�
-蘊�蘊�蘊�	蘊�蘊�蘊�筝�筝�
-蘊�蘊�	蘊�蘊�筝�筝�筝�
-蘊�	蘊�筝�筝�筝�筝�
-	筝�筝�筝�筝�筝�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -141,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_rtrim_sjis.result b/mysql-test/suite/jp/r/jp_rtrim_sjis.result
index 01ab173c982..fc5b490abc9 100644
--- a/mysql-test/suite/jp/r/jp_rtrim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_sjis.result
@@ -7,7 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�P` VALUES ('渦慨� ');
 INSERT INTO `�s�P` VALUES ('渦慨�  ');
@@ -85,27 +81,6 @@ INSERT INTO `�s�X` VALUES ('�\�\�\�\�\   ');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@�@');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@�@�@');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES ('渦慨� ');
-INSERT INTO `�s�P�O` VALUES ('渦慨�  ');
-INSERT INTO `�s�P�O` VALUES ('渦慨�   ');
-INSERT INTO `�s�P�O` VALUES ('渦慨��@');
-INSERT INTO `�s�P�O` VALUES ('渦慨��@�@');
-INSERT INTO `�s�P�O` VALUES ('渦慨��@�@�@');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES ('���������� ');
-INSERT INTO `�s�P�P` VALUES ('����������  ');
-INSERT INTO `�s�P�P` VALUES ('����������   ');
-INSERT INTO `�s�P�P` VALUES ('�����������@');
-INSERT INTO `�s�P�P` VALUES ('�����������@�@');
-INSERT INTO `�s�P�P` VALUES ('�����������@�@�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\ ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\  ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\   ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@�@�@');
 SELECT RTRIM(`�b�P`) from `�s�P`;
 RTRIM(`�b�P`)
 渦慨�
@@ -187,33 +162,6 @@ RTRIM(`�b�P`)
 �\�\�\�\�\�@
 �\�\�\�\�\�@�@
 �\�\�\�\�\�@�@�@
-SELECT RTRIM(`�b�P`) from `�s�P�O`;
-RTRIM(`�b�P`)
-渦慨�
-渦慨�
-渦慨�
-渦慨�
-渦慨��@
-渦慨��@�@
-渦慨��@�@�@
-SELECT RTRIM(`�b�P`) from `�s�P�P`;
-RTRIM(`�b�P`)
-����������
-����������
-����������
-����������
-�����������@
-�����������@�@
-�����������@�@�@
-SELECT RTRIM(`�b�P`) from `�s�P�Q`;
-RTRIM(`�b�P`)
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\
-�\�\�\�\�\�@
-�\�\�\�\�\�@�@
-�\�\�\�\�\�@�@�@
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -223,6 +171,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
index 905f5bef08f..417396350b5 100644
--- a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -17,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ  ');
@@ -86,27 +82,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡   ');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
 RTRIM(`Ｃ１`)
 ｱｲｳｴｵ
@@ -188,33 +163,6 @@ RTRIM(`Ｃ１`)
 龔龖龗龞龡　
 龔龖龗龞龡　　
 龔龖龗龞龡　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-RTRIM(`Ｃ１`)
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ　
-ｱｲｳｴｵ　　
-ｱｲｳｴｵ　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-RTRIM(`Ｃ１`)
-あいうえお
-あいうえお
-あいうえお
-あいうえお
-あいうえお　
-あいうえお　　
-あいうえお　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-RTRIM(`Ｃ１`)
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡　
-龔龖龗龞龡　　
-龔龖龗龞龡　　　
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -224,6 +172,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_rtrim_ujis.result b/mysql-test/suite/jp/r/jp_rtrim_ujis.result
index 84b141c16dc..d922cab93ef 100644
--- a/mysql-test/suite/jp/r/jp_rtrim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_ujis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ  ');
@@ -85,27 +81,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡   ');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
 RTRIM(`Ｃ１`)
 ｱｲｳｴｵ
@@ -187,33 +162,6 @@ RTRIM(`Ｃ１`)
 龔龖龗龞龡　
 龔龖龗龞龡　　
 龔龖龗龞龡　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-RTRIM(`Ｃ１`)
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ　
-ｱｲｳｴｵ　　
-ｱｲｳｴｵ　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-RTRIM(`Ｃ１`)
-あいうえお
-あいうえお
-あいうえお
-あいうえお
-あいうえお　
-あいうえお　　
-あいうえお　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-RTRIM(`Ｃ１`)
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡　
-龔龖龗龞龡　　
-龔龖龗龞龡　　　
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -223,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_rtrim_utf8.result b/mysql-test/suite/jp/r/jp_rtrim_utf8.result
index 09d719f3386..d793f895793 100644
--- a/mysql-test/suite/jp/r/jp_rtrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_utf8.result
@@ -7,7 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔� ');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�  ');
@@ -85,27 +81,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�   ');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜��');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜�����');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜��������');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔� ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�  ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�   ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣��');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣�����');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣��������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('��������������� ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������  ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������   ');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊� ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�  ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�   ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜��');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜�����');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜��������');
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 RTRIM(`鐚ｏ��`)
 鐔縁讐鐔鰹輯鐔�
@@ -187,33 +162,6 @@ RTRIM(`鐚ｏ��`)
 蘊�蘊�蘊�蘊�蘊＜��
 蘊�蘊�蘊�蘊�蘊＜�����
 蘊�蘊�蘊�蘊�蘊＜��������
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-RTRIM(`鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔泣��
-鐔縁讐鐔鰹輯鐔泣�����
-鐔縁讐鐔鰹輯鐔泣��������
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-RTRIM(`鐚ｏ��`)
-���������������
-���������������
-���������������
-���������������
-������������������
-���������������������
-������������������������
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-RTRIM(`鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＜��
-蘊�蘊�蘊�蘊�蘊＜�����
-蘊�蘊�蘊�蘊�蘊＜��������
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -223,6 +171,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_select_sjis.result b/mysql-test/suite/jp/r/jp_select_sjis.result
index d48d08d745f..38c1cf06448 100644
--- a/mysql-test/suite/jp/r/jp_select_sjis.result
+++ b/mysql-test/suite/jp/r/jp_select_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT * FROM `�s�P`;
 �b�P
  !"#$%&'()*+,-./
@@ -285,89 +276,6 @@ SELECT * FROM `�s�W`;
 SELECT * FROM `�s�X`;
 �b�P
 �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�O`;
-�b�P
- !"#$%&'()*+,-./
-0123456789:;<=>?
-@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_
-abcdefghijklmno
-pqrstuvwxyz{|}~
- 、�ぅΗ┤������
-葦桶患況弦沙悉梢
-請唾津毒班碧麺力
-佰厶壞嶐慵无槿渤
-SELECT * FROM `�s�P�P`;
-�b�P
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�]�}�~��������������������������������
-�������������������������������E�E�E�E�E
-�E�����������������������������E�E�E�E�E
-�E�E�E�E�E�E�����������������E�E�E�E�E�E
-�E�E���������������E�E�E�E�E�E�E�E�E�E�E
-�������������������������������E�E�E�E�E
-�E�E�����������������E�E�E�E���E�E�E�E�@
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�O�P�Q�R
-�S�T�U�V�W�X�E�E�E�E�E�E�E�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�E
-�E�E�E�E�E������������������������������
-�����������������������E�E�E�E�E�E�E�E�E
-�E��������������������������������������
-����������������������������������������
-����������������������������������������
-����������������������������������������
-���������E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������
-���������������E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������
-�����������E�E�E�E�E�E�E�E��������������
-�����������������������������������E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������
-�����E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������
-���������������������������E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������
-����������������������������������������
-����������������������������������������
-����������������������������������������
-�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E��������������������������������������
-����������������������������������������
-����������������������������������������
-����������������������������������������
-�������������������������������E�E�E�E�E
-�E�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�S�T�U�V�W�X�Y�Z�[�\�]�^�_�`�a�b�c�d�e�f
-�g�h�i�j�k�l�m�n�o�p�q�r�s�t�u�v�w�x�y�z
-�{�|�}�~��������������������������������
-�������������������������������E�E�E�E�E
-�E����蝓蝣蝪蠅�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E�E
-SELECT * FROM `�s�P�Q`;
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -377,6 +285,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_select_ucs2.result b/mysql-test/suite/jp/r/jp_select_ucs2.result
index 39d057ed107..a02cc2ead77 100644
--- a/mysql-test/suite/jp/r/jp_select_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_select_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -22,9 +19,6 @@ CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myi
 CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
 CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
 CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -91,28 +85,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT * FROM `Ｔ１`;
 c1
  ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
@@ -188,31 +160,6 @@ c1
 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-SELECT * FROM `Ｔ１０`;
-c1
-PQRSTUVWXYZ[\]^_
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT * FROM `Ｔ１１`;
-c1
-ヾゝゞ〃仝々〆〇ー―‐／\〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-・ァアィイゥウェエォオカガキギクグケゲコ
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-SELECT * FROM `Ｔ１２`;
-c1
-・˛˚~΄΅・・・・・・・・¡¦¿・・・
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -222,6 +169,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_select_ujis.result b/mysql-test/suite/jp/r/jp_select_ujis.result
index 3eea73c8083..b8dbe2f6732 100644
--- a/mysql-test/suite/jp/r/jp_select_ujis.result
+++ b/mysql-test/suite/jp/r/jp_select_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = inn
 CREATE TABLE `Ｔ４` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１`;
 c1
  !"#$%&'()*+,-./
@@ -402,128 +393,6 @@ c1
 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
 龔龖龗龞龡龢龣龥・・・・・・・・・・・・
 ・・・・・・・・・・・・・・・・・・・・
-SELECT * FROM `Ｔ１０`;
-c1
- !"#$%&'()*+,-./
-0123456789:;<=>?
-@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_
-abcdefghijklmno
-pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT * FROM `Ｔ１１`;
-c1
-　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・　
-・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-SELECT * FROM `Ｔ１２`;
-c1
-・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚~΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -533,6 +402,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_select_utf8.result b/mysql-test/suite/jp/r/jp_select_utf8.result
index 43704ad2f6e..bc7b23cd51c 100644
--- a/mysql-test/suite/jp/r/jp_select_utf8.result
+++ b/mysql-test/suite/jp/r/jp_select_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = i
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 SELECT * FROM `鐚器��`;
 c1
  !"#$%&'()*+,-./
@@ -402,128 +393,6 @@ c1
 藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�
 蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
 ��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT * FROM `鐚器��鐚�`;
-c1
- !"#$%&'()*+,-./
-0123456789:;<=>?
-@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_
-abcdefghijklmno
-pqrstuvwxyz{|}~
- 鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
-SELECT * FROM `鐚器��鐚�`;
-c1
-������������鐚�鐚���誌��鐚�鐚�鐚�������卒鐔�即鐚常殖鐚帥��
-��障��������篁������������錫�����鐚�鐚若�����鐔������モ�����
-������鐚�鐚�������鐚誌悉鐔�鐔�������������������������������
-鐚����賊��歎鐚����鐚�鐚������р����癌�����属��霞�鰍��鐃�
-鐚�蔵贈鐚�鐚�鐚�鐚�鐚�則��������������������祉�祉�祉�祉��
-��獅����≠����鰍�霞�盾�錫�祉�������������������祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�獅�������������������������祉�祉�祉�祉�祉��
-��祉�獅�р��測��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-�����モ����������≠�������������盾����汲�������祉�祉�祉�祉��
-��祉�獅����謂�������������‖吟�祉�祉�祉�獅����祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�誌��鐚�鐚�鐚�
-鐚�鐚�鐚�鐚�鐚�鐚���祉�祉�祉�祉�祉�祉�誌次鐚�鐚ｏ爾鐚ワ痔鐚�
-鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚�鐚逸識鐚駕竺鐚器宍鐚駈七鐚醐執鐚冴��
-��祉�祉�祉�祉�誌��鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�
-鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔�鐔���祉�祉�祉�祉�祉�祉�祉�祉��
-��祉��������������������������������������������������������
-�����������������������������������������＜�≪�ｃ�ゃ�ャ�����
-��������������������������違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴��
-��若�純�障�帥�����������������������������������������������
-��������������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�＜�≪�ｃ�ゃ�ャ����с�������������������������違�宴�蚊��
-��眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�帥�����������������������
-������������������������������������������������������������
-�����������������＜�≪�ｃ�ゃ�ャ����с�����������������������
-��違�宴�蚊�潟�眼�泣�吟�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��士�������������������������������痢裡里
-離陸律率立��祉�祉�祉�祉�祉�祉�祉�士盈歌確肝砧粁�
-慮旅虜了亮僚両凌��������������������祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��姉�����������������������������������弌
-丐丕个丱丶丼丿乂乖乘亂亅豫亊��祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�姉夷頴火覚莞却�亢亰亳亶
-从仍仄仆仂仗����������������������������
-�ﾑ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��獅�������������������������も�癌�錫�������������������ｂ��
-�����獅�������������撃�垂����謂�モ�呉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私�����紲���水��������紮狗�∵�笈��腥������≧献���������薇�
-罌���ф�≧�怨��紮���脂４腟∝蕎藪����膕�茴桁��綺究�����罅����
-�����鋌ヤ��篏�箴������峨し紮�紲�絨���������井��罎���榊�����
-腱紫境膩�������茵ｈ�������阪�私��篋ュ����臥��脾�筝�紕掩頃���
-腮画�����薜������医�遵�≦��紮糸��蕋我繰��よ����祉�祉�祉�祉��
-��肢����ｉ�����薛�罠����莖�莊���峨�翫��綮�綣����罐惹��羌�羲�
-��∝�主�������乗��������藝�胼������画��������荅掩��莖�������
-���薹俄��篋�薜�荅�������罎�羚丞�������祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��糸��筝�筝�筝�筝延原筝寂舷箙�箙�箙�篋�篋�莟�篋����綣�篋�篋�
-篋�篋�篋≫紺篋割唆篁�篁�篁�篁�篁�篁�篁�篁�篁�篁隙��篏�篌遺��
-篏�篏�篏�篏銀��箴鋐�篏私秋篏遺��篏�箴�箴����篆�篆�篆�篆�篆�
-篆�篆�篆�篆や織��������������ュ��篌�篆九�≦�����篆鞘侵������
-�����������������������������後����������翫�蚊�祉�祉�祉�祉��
-��脂��薺�薺ら��薺�薺�薺臥��藏�藏�薺�薺咲��藏ら匡藏臥��薹�藏�
-藏檎矯薹�薹騂�薹�薹�薹檎窪薹�薹�薹初��藐�藐�藕級更藕初��藝�
-藝�藝�藝�藝�藝�藝�藝ラ懇藝檎昏藝���♂��藥�藥騌�藥�藥�藥�藥�
-藥�藥ラ雑藥�藥顔散藥潔珊藥脂纂藥初��藜���潔��藜♂蒔藜冗��藹�
-藹�藹ｉ��藹�藹♂拾藹ч習藹�藹潔讐藹狗��蘊�蘊���祉�祉�祉�祉��
-��糸��罕������ゅ�������祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-SELECT * FROM `鐚器��鐚�`;
-c1
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�史���存����
-��史���鐔�������祉�祉�祉�祉�祉�祉�祉�斬‖β帥�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�斬座�息速���
-造�����祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�士�������葎��士���士ﾎ���士���祉�祉��
-��士�劉流溜������������琉����祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�姉�����������
-�����������ﾐ���祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�姿���������������������������祉�祉�祉�祉��
-��暫�����残���残蚊�仕�朕��仕�������仕γ���祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�暫δ�丹徴脹蝶銚
-��������淡����擢綻��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫������������������������������ﾃ�����
-������������残���帳��弔�������ﾇ棵暢町懲
-調超長捗鳥������������������������������
-��������鼎鄭��������適��徹的轍溺敵������
-��鉄��展填店貼纏��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��暫｜�辰但���ﾄ���奪達������巽���枎竪谷
-棚��������乃������残…ッ�狸誰樽����残�眺挑
-諜跳頂直勅������単坦嘆旦担������探������
-����邸��泥釘炭湛端短鏑��撤笛迭哲滴������
-��典箪耽天添転甜��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��私��筝�筝�筝�筝�筝�筝ｄ犬筝�筝�筝�筝�筝遺元箙�箙�箙�箙�箙�
-箙�箙�箙ｄ宏箙�箙岩控箙剛洪篋�篋�篋�篋�篋�篋剛��篁�篁�篁�篁�
-篁＞拶篁�篁�篁延山篁灸蚕篁鞘賛篌�篌�篌�篌�篌�篌�篌�篌�篌�篌�
-篌�篌�篌延��篌割宍篌隙執篌私湿篏�篏�篏�篏�篏�篏�篏�篏�篏�篏�
-篏�篏ｄ終篏�篏�篏延酬篏娯醜篏坂十篏鞘��箴�箴���祉�祉�祉�祉��
-��脂燦藥翠��藜�藜�藜騐�藜�藜�藜�藜�藜�藜�藜�藜�藜�藜∫痔藜�
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-藹�藹�藹�藹�藹�藹�藹�藹�藹�藹�藹育襲藹渇週藹咲十蘊騖�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊♂匠蘊ｉ哨��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
-��祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉�祉��
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -533,6 +402,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_subquery_sjis.result b/mysql-test/suite/jp/r/jp_subquery_sjis.result
index b94de3630af..d1dd688e938 100644
--- a/mysql-test/suite/jp/r/jp_subquery_sjis.result
+++ b/mysql-test/suite/jp/r/jp_subquery_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb;
@@ -24,18 +21,12 @@ CREATE TABLE `�s�Ta` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine
 CREATE TABLE `�s�Tb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ua` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ub` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Oa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Ob` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�Pa` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�Pb` VALUES ('�');
 INSERT INTO `�s�Qa` VALUES ('��'),('��'),('��');
@@ -54,12 +45,6 @@ INSERT INTO `�s�Wa` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�Wb` VALUES ('��');
 INSERT INTO `�s�Xa` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�Xb` VALUES ('�\');
-INSERT INTO `�s�P�Oa` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�Ob` VALUES ('�');
-INSERT INTO `�s�P�Pa` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Pb` VALUES ('��');
-INSERT INTO `�s�P�Qa` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�Qb` VALUES ('�\');
 SELECT `�b�P` FROM `�s�Pa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�Pb`);
 �b�P
 �
@@ -150,36 +135,6 @@ SELECT `�b�P` FROM `�s�Xa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�Xb` WHERE `�
 �b�P
 �\
 �\
-SELECT `�b�P` FROM `�s�P�Oa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Ob`);
-�b�P
-�
-SELECT `�b�P` FROM `�s�P�Oa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Ob` WHERE `�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-�b�P
-�
-SELECT `�b�P` FROM `�s�P�Oa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Ob` WHERE `�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-�b�P
-�
-�
-SELECT `�b�P` FROM `�s�P�Pa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Pb`);
-�b�P
-��
-SELECT `�b�P` FROM `�s�P�Pa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Pb` WHERE `�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-�b�P
-��
-SELECT `�b�P` FROM `�s�P�Pa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Pb` WHERE `�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-�b�P
-��
-��
-SELECT `�b�P` FROM `�s�P�Qa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Qb`);
-�b�P
-�\
-SELECT `�b�P` FROM `�s�P�Qa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Qb` WHERE `�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-�b�P
-�\
-SELECT `�b�P` FROM `�s�P�Qa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Qb` WHERE `�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-�b�P
-�\
-�\
 DROP TABLE `�s�Pa`;
 DROP TABLE `�s�Pb`;
 DROP TABLE `�s�Qa`;
@@ -198,9 +153,3 @@ DROP TABLE `�s�Wa`;
 DROP TABLE `�s�Wb`;
 DROP TABLE `�s�Xa`;
 DROP TABLE `�s�Xb`;
-DROP TABLE `�s�P�Oa`;
-DROP TABLE `�s�P�Ob`;
-DROP TABLE `�s�P�Pa`;
-DROP TABLE `�s�P�Pb`;
-DROP TABLE `�s�P�Qa`;
-DROP TABLE `�s�P�Qb`;
diff --git a/mysql-test/suite/jp/r/jp_subquery_ucs2.result b/mysql-test/suite/jp/r/jp_subquery_ucs2.result
index 023100ecce3..1cafa1ae83b 100644
--- a/mysql-test/suite/jp/r/jp_subquery_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_subquery_ucs2.result
@@ -1,15 +1,21 @@
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -25,18 +31,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine
 CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
 INSERT INTO `Ｔ１b` VALUES ('ｱ');
 INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
@@ -55,12 +55,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`);
 Ｃ１
 ｱ
@@ -151,36 +145,6 @@ SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `�
 Ｃ１
 龖
 龗
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`);
-Ｃ１
-ｱ
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-Ｃ１
-ｱ
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-Ｃ１
-ｶ
-ｻ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`);
-Ｃ１
-あ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-Ｃ１
-あ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-Ｃ１
-か
-さ
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`);
-Ｃ１
-龔
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-Ｃ１
-龔
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-Ｃ１
-龖
-龗
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -199,9 +163,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/r/jp_subquery_ujis.result b/mysql-test/suite/jp/r/jp_subquery_ujis.result
index 0b6aa03970f..530f7e1ad9f 100644
--- a/mysql-test/suite/jp/r/jp_subquery_ujis.result
+++ b/mysql-test/suite/jp/r/jp_subquery_ujis.result
@@ -1,15 +1,21 @@
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
@@ -24,18 +30,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine
 CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ');
 INSERT INTO `Ｔ１b` VALUES ('ｱ');
 INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ');
@@ -54,12 +54,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`);
 Ｃ１
 ｱ
@@ -150,36 +144,6 @@ SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `�
 Ｃ１
 龖
 龗
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`);
-Ｃ１
-ｱ
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-Ｃ１
-ｱ
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-Ｃ１
-ｶ
-ｻ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`);
-Ｃ１
-あ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-Ｃ１
-あ
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-Ｃ１
-か
-さ
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`);
-Ｃ１
-龔
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-Ｃ１
-龔
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-Ｃ１
-龖
-龗
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -198,9 +162,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/r/jp_subquery_utf8.result b/mysql-test/suite/jp/r/jp_subquery_utf8.result
index ce56e660a65..d82cfbaca9d 100644
--- a/mysql-test/suite/jp/r/jp_subquery_utf8.result
+++ b/mysql-test/suite/jp/r/jp_subquery_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
@@ -24,18 +21,12 @@ CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 eng
 CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��a` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��b` VALUES ('鐔�');
 INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
@@ -54,12 +45,6 @@ INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��b` VALUES ('���');
 INSERT INTO `鐚器��a` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��b` VALUES ('蘊�');
-INSERT INTO `鐚器��鐚�a` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�b` VALUES ('鐔�');
-INSERT INTO `鐚器��鐚�a` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�b` VALUES ('���');
-INSERT INTO `鐚器��鐚�a` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�b` VALUES ('蘊�');
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 鐚ｏ��
 鐔�
@@ -150,36 +135,6 @@ SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b`
 鐚ｏ��
 蘊�
 蘊�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-鐚ｏ��
-鐔�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-鐔�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-鐔�
-鐔�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-鐚ｏ��
-���
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-���
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-���
-���
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-鐚ｏ��
-蘊�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-蘊�
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-鐚ｏ��
-蘊�
-蘊�
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
@@ -198,9 +153,3 @@ DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
diff --git a/mysql-test/suite/jp/r/jp_substring_sjis.result b/mysql-test/suite/jp/r/jp_substring_sjis.result
index 3fe5bf44b86..a8e98cc62f5 100644
--- a/mysql-test/suite/jp/r/jp_substring_sjis.result
+++ b/mysql-test/suite/jp/r/jp_substring_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P`;
 �b�P	SUBSTRING(`�b�P`,0)
 	
@@ -2052,678 +2043,6 @@ SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�X`;
 �\�\	�\�\
 �\	�\
 	
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,2)
-渦慨�	桶患
-渦慨	桶�
-渦�	桶
-渦	�
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,3)
-渦慨�	慨�
-渦慨	慨
-渦�	�
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,4)
-渦慨�	患
-渦慨	�
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,5)
-渦慨�	�
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,6)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 2)
-渦慨�	桶患
-渦慨	桶�
-渦�	桶
-渦	�
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 3)
-渦慨�	慨�
-渦慨	慨
-渦�	�
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 4)
-渦慨�	患
-渦慨	�
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 5)
-渦慨�	�
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 6)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,1)
-渦慨�	�
-渦慨	�
-渦�	�
-渦	�
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,2)
-渦慨�	渦
-渦慨	渦
-渦�	渦
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,3)
-渦慨�	渦�
-渦慨	渦�
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,4)
-渦慨�	渦慨
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,5)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P`,1,6)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 0)
-渦慨�	
-渦慨	
-渦�	
-渦	
-�	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 1)
-渦慨�	�
-渦慨	�
-渦�	�
-渦	�
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 2)
-渦慨�	渦
-渦慨	渦
-渦�	渦
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 3)
-渦慨�	渦�
-渦慨	渦�
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 4)
-渦慨�	渦慨
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 5)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�O`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 6)
-渦慨�	渦慨�
-渦慨	渦慨
-渦�	渦�
-渦	渦
-�	�
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,2)
-����������	��������
-��������	������
-������	����
-����	��
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,3)
-����������	������
-��������	����
-������	��
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,4)
-����������	����
-��������	��
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,5)
-����������	��
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,6)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 2)
-����������	��������
-��������	������
-������	����
-����	��
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 3)
-����������	������
-��������	����
-������	��
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 4)
-����������	����
-��������	��
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 5)
-����������	��
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 6)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,1)
-����������	��
-��������	��
-������	��
-����	��
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,2)
-����������	����
-��������	����
-������	����
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,3)
-����������	������
-��������	������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,4)
-����������	��������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,5)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P`,1,6)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 0)
-����������	
-��������	
-������	
-����	
-��	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 1)
-����������	��
-��������	��
-������	��
-����	��
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 2)
-����������	����
-��������	����
-������	����
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 3)
-����������	������
-��������	������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 4)
-����������	��������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 5)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�P`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 6)
-����������	����������
-��������	��������
-������	������
-����	����
-��	��
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,2)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\
-�\�\	�\
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,4)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,5)
-�\�\�\�\�\	�\
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,6)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 2)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\
-�\�\	�\
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 4)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 5)
-�\�\�\�\�\	�\
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 6)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,1)
-�\�\�\�\�\	�\
-�\�\�\�\	�\
-�\�\�\	�\
-�\�\	�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,2)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,4)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,5)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P`,1,6)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 0)
-�\�\�\�\�\	
-�\�\�\�\	
-�\�\�\	
-�\�\	
-�\	
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 1)
-�\�\�\�\�\	�\
-�\�\�\�\	�\
-�\�\�\	�\
-�\�\	�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 2)
-�\�\�\�\�\	�\�\
-�\�\�\�\	�\�\
-�\�\�\	�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 3)
-�\�\�\�\�\	�\�\�\
-�\�\�\�\	�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 4)
-�\�\�\�\�\	�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 5)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�Q`;
-�b�P	SUBSTRING(`�b�P` FROM 1 FOR 6)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\	�\�\�\�\
-�\�\�\	�\�\�\
-�\�\	�\�\
-�\	�\
-	
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -2733,6 +2052,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_substring_ucs2.result b/mysql-test/suite/jp/r/jp_substring_ucs2.result
index cb2a5b5b946..5b01928f2a9 100644
--- a/mysql-test/suite/jp/r/jp_substring_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_substring_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１`;
 Ｃ１	SUBSTRING(`Ｃ１`,1,0)
 	
@@ -1045,342 +1036,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -1390,6 +1045,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_substring_ujis.result b/mysql-test/suite/jp/r/jp_substring_ujis.result
index 229de0c0236..6285271d267 100644
--- a/mysql-test/suite/jp/r/jp_substring_ujis.result
+++ b/mysql-test/suite/jp/r/jp_substring_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１`;
 Ｃ１	SUBSTRING(`Ｃ１`,0)
 	
@@ -2052,678 +2043,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
 龔龖	龔龖
 龔	龔
 	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,2)
-ｱｲｳｴｵ	ｲｳｴｵ
-ｱｲｳｴ	ｲｳｴ
-ｱｲｳ	ｲｳ
-ｱｲ	ｲ
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,3)
-ｱｲｳｴｵ	ｳｴｵ
-ｱｲｳｴ	ｳｴ
-ｱｲｳ	ｳ
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,4)
-ｱｲｳｴｵ	ｴｵ
-ｱｲｳｴ	ｴ
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,5)
-ｱｲｳｴｵ	ｵ
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,6)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 2)
-ｱｲｳｴｵ	ｲｳｴｵ
-ｱｲｳｴ	ｲｳｴ
-ｱｲｳ	ｲｳ
-ｱｲ	ｲ
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 3)
-ｱｲｳｴｵ	ｳｴｵ
-ｱｲｳｴ	ｳｴ
-ｱｲｳ	ｳ
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 4)
-ｱｲｳｴｵ	ｴｵ
-ｱｲｳｴ	ｴ
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 5)
-ｱｲｳｴｵ	ｵ
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 6)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-ｱｲｳｴｵ	
-ｱｲｳｴ	
-ｱｲｳ	
-ｱｲ	
-ｱ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-ｱｲｳｴｵ	ｱ
-ｱｲｳｴ	ｱ
-ｱｲｳ	ｱ
-ｱｲ	ｱ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-ｱｲｳｴｵ	ｱｲ
-ｱｲｳｴ	ｱｲ
-ｱｲｳ	ｱｲ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-ｱｲｳｴｵ	ｱｲｳ
-ｱｲｳｴ	ｱｲｳ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-ｱｲｳｴｵ	ｱｲｳｴ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	ｱｲｳｴ
-ｱｲｳ	ｱｲｳ
-ｱｲ	ｱｲ
-ｱ	ｱ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,2)
-あいうえお	いうえお
-あいうえ	いうえ
-あいう	いう
-あい	い
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,3)
-あいうえお	うえお
-あいうえ	うえ
-あいう	う
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,4)
-あいうえお	えお
-あいうえ	え
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,5)
-あいうえお	お
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,6)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 2)
-あいうえお	いうえお
-あいうえ	いうえ
-あいう	いう
-あい	い
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 3)
-あいうえお	うえお
-あいうえ	うえ
-あいう	う
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 4)
-あいうえお	えお
-あいうえ	え
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 5)
-あいうえお	お
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 6)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-あいうえお	
-あいうえ	
-あいう	
-あい	
-あ	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-あいうえお	あ
-あいうえ	あ
-あいう	あ
-あい	あ
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-あいうえお	あい
-あいうえ	あい
-あいう	あい
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-あいうえお	あいう
-あいうえ	あいう
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-あいうえお	あいうえ
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-あいうえお	あいうえお
-あいうえ	あいうえ
-あいう	あいう
-あい	あい
-あ	あ
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,2)
-龔龖龗龞龡	龖龗龞龡
-龔龖龗龞	龖龗龞
-龔龖龗	龖龗
-龔龖	龖
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,3)
-龔龖龗龞龡	龗龞龡
-龔龖龗龞	龗龞
-龔龖龗	龗
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,4)
-龔龖龗龞龡	龞龡
-龔龖龗龞	龞
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,5)
-龔龖龗龞龡	龡
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,6)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 2)
-龔龖龗龞龡	龖龗龞龡
-龔龖龗龞	龖龗龞
-龔龖龗	龖龗
-龔龖	龖
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 3)
-龔龖龗龞龡	龗龞龡
-龔龖龗龞	龗龞
-龔龖龗	龗
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 4)
-龔龖龗龞龡	龞龡
-龔龖龗龞	龞
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 5)
-龔龖龗龞龡	龡
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 6)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１`,1,6)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 0)
-龔龖龗龞龡	
-龔龖龗龞	
-龔龖龗	
-龔龖	
-龔	
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 1)
-龔龖龗龞龡	龔
-龔龖龗龞	龔
-龔龖龗	龔
-龔龖	龔
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 2)
-龔龖龗龞龡	龔龖
-龔龖龗龞	龔龖
-龔龖龗	龔龖
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 3)
-龔龖龗龞龡	龔龖龗
-龔龖龗龞	龔龖龗
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 4)
-龔龖龗龞龡	龔龖龗龞
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 5)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
-Ｃ１	SUBSTRING(`Ｃ１` FROM 1 FOR 6)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞	龔龖龗龞
-龔龖龗	龔龖龗
-龔龖	龔龖
-龔	龔
-	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -2733,6 +2052,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_substring_utf8.result b/mysql-test/suite/jp/r/jp_substring_utf8.result
index f838a2e75e2..80c4ad5c6c1 100644
--- a/mysql-test/suite/jp/r/jp_substring_utf8.result
+++ b/mysql-test/suite/jp/r/jp_substring_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��`;
 鐚ｏ��	SUBSTRING(`鐚ｏ��`,0)
 	
@@ -2052,678 +2043,6 @@ SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��`;
 蘊�蘊�	蘊�蘊�
 蘊�	蘊�
 	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,2)
-鐔縁讐鐔鰹輯鐔�	鐔駕蹴鐔器週
-鐔縁讐鐔鰹輯	鐔駕蹴鐔�
-鐔縁讐鐔�	鐔駕蹴
-鐔縁讐	鐔�
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,3)
-鐔縁讐鐔鰹輯鐔�	鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔鰹輯
-鐔縁讐鐔�	鐔�
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,4)
-鐔縁讐鐔鰹輯鐔�	鐔器週
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,5)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,6)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 2)
-鐔縁讐鐔鰹輯鐔�	鐔駕蹴鐔器週
-鐔縁讐鐔鰹輯	鐔駕蹴鐔�
-鐔縁讐鐔�	鐔駕蹴
-鐔縁讐	鐔�
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 3)
-鐔縁讐鐔鰹輯鐔�	鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔鰹輯
-鐔縁讐鐔�	鐔�
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 4)
-鐔縁讐鐔鰹輯鐔�	鐔器週
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 5)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 6)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,1)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	鐔�
-鐔縁讐	鐔�
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,2)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐
-鐔縁讐鐔鰹輯	鐔縁讐
-鐔縁讐鐔�	鐔縁讐
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,3)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔�
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,4)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,5)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,6)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 0)
-鐔縁讐鐔鰹輯鐔�	
-鐔縁讐鐔鰹輯	
-鐔縁讐鐔�	
-鐔縁讐	
-鐔�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 1)
-鐔縁讐鐔鰹輯鐔�	鐔�
-鐔縁讐鐔鰹輯	鐔�
-鐔縁讐鐔�	鐔�
-鐔縁讐	鐔�
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 2)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐
-鐔縁讐鐔鰹輯	鐔縁讐
-鐔縁讐鐔�	鐔縁讐
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 3)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔�
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 4)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 5)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 6)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯	鐔縁讐鐔鰹輯
-鐔縁讐鐔�	鐔縁讐鐔�
-鐔縁讐	鐔縁讐
-鐔�	鐔�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,2)
-���������������	������������
-������������	���������
-���������	������
-������	���
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,3)
-���������������	���������
-������������	������
-���������	���
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,4)
-���������������	������
-������������	���
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,5)
-���������������	���
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,6)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 2)
-���������������	������������
-������������	���������
-���������	������
-������	���
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 3)
-���������������	���������
-������������	������
-���������	���
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 4)
-���������������	������
-������������	���
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 5)
-���������������	���
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 6)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,1)
-���������������	���
-������������	���
-���������	���
-������	���
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,2)
-���������������	������
-������������	������
-���������	������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,3)
-���������������	���������
-������������	���������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,4)
-���������������	������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,5)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,6)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 0)
-���������������	
-������������	
-���������	
-������	
-���	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 1)
-���������������	���
-������������	���
-���������	���
-������	���
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 2)
-���������������	������
-������������	������
-���������	������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 3)
-���������������	���������
-������������	���������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 4)
-���������������	������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 5)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 6)
-���������������	���������������
-������������	������������
-���������	���������
-������	������
-���	���
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,5)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,6)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 5)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 6)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,1)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,5)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��`,1,6)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 0)
-蘊�蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�蘊�	
-蘊�蘊�蘊�	
-蘊�蘊�	
-蘊�	
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 1)
-蘊�蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�蘊�	蘊�
-蘊�蘊�蘊�	蘊�
-蘊�蘊�	蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 2)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 3)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 4)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 5)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-鐚ｏ��	SUBSTRING(`鐚ｏ��` FROM 1 FOR 6)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�	蘊�蘊�蘊�
-蘊�蘊�	蘊�蘊�
-蘊�	蘊�
-	
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -2733,6 +2052,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_trim_sjis.result b/mysql-test/suite/jp/r/jp_trim_sjis.result
index e6ab86fd20a..604b2afcae5 100644
--- a/mysql-test/suite/jp/r/jp_trim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_trim_sjis.result
@@ -1,27 +1,11 @@
-drop table if exists `�s�P`;
-drop table if exists `�s�Q`;
-drop table if exists `�s�R`;
-drop table if exists `�s�S`;
-drop table if exists `�s�T`;
-drop table if exists `�s�U`;
-drop table if exists `�s�V`;
-drop table if exists `�s�W`;
-drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 SET NAMES sjis;
 SET character_set_database = sjis;
-CREATE TABLE `�s�P` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�Q` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�R` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�S` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�T` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�U` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+DROP TABLE IF EXISTS `�s�P`;
+DROP TABLE IF EXISTS `�s�Q`;
+DROP TABLE IF EXISTS `�s�R`;
+CREATE TABLE `�s�P` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�Q` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�R` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�P` VALUES ('渦慨偽');
 INSERT INTO `�s�P` VALUES ('渦慨偽�');
@@ -49,87 +33,6 @@ INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
 INSERT INTO `�s�R` VALUES ('   �\�\�\�\�\   ');
-INSERT INTO `�s�S` VALUES ('渦慨�');
-INSERT INTO `�s�S` VALUES ('渦慨偽');
-INSERT INTO `�s�S` VALUES ('渦慨偽�');
-INSERT INTO `�s�S` VALUES ('渦慨偽橋');
-INSERT INTO `�s�S` VALUES ('怯桶患');
-INSERT INTO `�s�S` VALUES ('橋渦慨�');
-INSERT INTO `�s�S` VALUES ('橋怯桶患');
-INSERT INTO `�s�S` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�S` VALUES ('   渦慨�   ');
-INSERT INTO `�s�T` VALUES ('����������');
-INSERT INTO `�s�T` VALUES ('������������');
-INSERT INTO `�s�T` VALUES ('��������������');
-INSERT INTO `�s�T` VALUES ('����������������');
-INSERT INTO `�s�T` VALUES ('������������');
-INSERT INTO `�s�T` VALUES ('��������������');
-INSERT INTO `�s�T` VALUES ('����������������');
-INSERT INTO `�s�T` VALUES ('����������������������');
-INSERT INTO `�s�T` VALUES ('   ����������   ');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('   �\�\�\�\�\   ');
-INSERT INTO `�s�V` VALUES ('渦慨�');
-INSERT INTO `�s�V` VALUES ('渦慨偽');
-INSERT INTO `�s�V` VALUES ('渦慨偽�');
-INSERT INTO `�s�V` VALUES ('渦慨偽橋');
-INSERT INTO `�s�V` VALUES ('怯桶患');
-INSERT INTO `�s�V` VALUES ('橋渦慨�');
-INSERT INTO `�s�V` VALUES ('橋怯桶患');
-INSERT INTO `�s�V` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�V` VALUES ('   渦慨�   ');
-INSERT INTO `�s�W` VALUES ('����������');
-INSERT INTO `�s�W` VALUES ('������������');
-INSERT INTO `�s�W` VALUES ('��������������');
-INSERT INTO `�s�W` VALUES ('����������������');
-INSERT INTO `�s�W` VALUES ('������������');
-INSERT INTO `�s�W` VALUES ('��������������');
-INSERT INTO `�s�W` VALUES ('����������������');
-INSERT INTO `�s�W` VALUES ('����������������������');
-INSERT INTO `�s�W` VALUES ('   ����������   ');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('   �\�\�\�\�\   ');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽�');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽橋');
-INSERT INTO `�s�P�O` VALUES ('怯桶患');
-INSERT INTO `�s�P�O` VALUES ('橋渦慨�');
-INSERT INTO `�s�P�O` VALUES ('橋怯桶患');
-INSERT INTO `�s�P�O` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�P�O` VALUES ('   渦慨�   ');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES ('������������');
-INSERT INTO `�s�P�P` VALUES ('��������������');
-INSERT INTO `�s�P�P` VALUES ('����������������');
-INSERT INTO `�s�P�P` VALUES ('������������');
-INSERT INTO `�s�P�P` VALUES ('��������������');
-INSERT INTO `�s�P�P` VALUES ('����������������');
-INSERT INTO `�s�P�P` VALUES ('����������������������');
-INSERT INTO `�s�P�P` VALUES ('   ����������   ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('   �\�\�\�\�\   ');
 SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(TRAILING '�' FROM `�b�P`)
    渦慨�	   渦慨�
@@ -218,8 +121,8 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�Q`;
 ��������������	��������������
 ����������������	����������������
 ����������������������	����������������������
-SELECT `�b�P`,TRIM(TRAILING '�\'FROM `�b�P`) FROM `�s�R`;
-�b�P	TRIM(TRAILING '�\'FROM `�b�P`)
+SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�R`;
+�b�P	TRIM(TRAILING '�\' FROM `�b�P`)
    �\�\�\�\�\	   �\�\�\�\�\
 �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\	�\�\�\�\�\
@@ -262,7 +165,45 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�R`;
 �\�\�\�\�\�\�\	�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�S`;
+DROP TABLE `�s�P`;
+DROP TABLE `�s�Q`;
+DROP TABLE `�s�R`;
+SET NAMES sjis;
+SET character_set_database = sjis;
+DROP TABLE IF EXISTS `�s�P`;
+DROP TABLE IF EXISTS `�s�Q`;
+DROP TABLE IF EXISTS `�s�R`;
+CREATE TABLE `�s�P` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�Q` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�R` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+INSERT INTO `�s�P` VALUES ('渦慨�');
+INSERT INTO `�s�P` VALUES ('渦慨偽');
+INSERT INTO `�s�P` VALUES ('渦慨偽�');
+INSERT INTO `�s�P` VALUES ('渦慨偽橋');
+INSERT INTO `�s�P` VALUES ('怯桶患');
+INSERT INTO `�s�P` VALUES ('橋渦慨�');
+INSERT INTO `�s�P` VALUES ('橋怯桶患');
+INSERT INTO `�s�P` VALUES ('橋怯桶患橋�');
+INSERT INTO `�s�P` VALUES ('   渦慨�   ');
+INSERT INTO `�s�Q` VALUES ('����������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('����������������������');
+INSERT INTO `�s�Q` VALUES ('   ����������   ');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('   �\�\�\�\�\   ');
+SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(TRAILING '�' FROM `�b�P`)
    渦慨�	   渦慨�
 渦慨�	渦慨�
@@ -273,7 +214,7 @@ SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�S`;
 橋渦慨�	橋渦慨�
 橋怯桶患	橋怯桶患
 橋怯桶患橋�	橋怯桶患
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�S`;
+SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(LEADING '�' FROM `�b�P`)
    渦慨�	   渦慨�
 渦慨�	渦慨�
@@ -284,7 +225,7 @@ SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�S`;
 橋渦慨�	渦慨�
 橋怯桶患	渦慨�
 橋怯桶患橋�	渦慨偽橋
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�S`;
+SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(BOTH '�' FROM `�b�P`)
    渦慨�	   渦慨�
 渦慨�	渦慨�
@@ -295,7 +236,7 @@ SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�S`;
 橋渦慨�	渦慨�
 橋怯桶患	渦慨�
 橋怯桶患橋�	渦慨�
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�S`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P`;
 �b�P	TRIM(`�b�P`)
    渦慨�	渦慨�
 渦慨�	渦慨�
@@ -306,7 +247,7 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�S`;
 橋渦慨�	橋渦慨�
 橋怯桶患	橋怯桶患
 橋怯桶患橋�	橋怯桶患橋�
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�T`;
+SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(TRAILING '��' FROM `�b�P`)
    ����������	   ����������
 ����������	����������
@@ -317,7 +258,7 @@ SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�T`;
 ��������������	��������������
 ����������������	����������������
 ����������������������	����������������
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�T`;
+SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(LEADING '��' FROM `�b�P`)
    ����������	   ����������
 ����������	����������
@@ -328,7 +269,7 @@ SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�T`;
 ��������������	����������
 ����������������	����������
 ����������������������	����������������
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�T`;
+SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(BOTH '��' FROM `�b�P`)
    ����������	   ����������
 ����������	����������
@@ -339,7 +280,7 @@ SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�T`;
 ��������������	����������
 ����������������	����������
 ����������������������	����������
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�T`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�Q`;
 �b�P	TRIM(`�b�P`)
    ����������	����������
 ����������	����������
@@ -350,7 +291,7 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�T`;
 ��������������	��������������
 ����������������	����������������
 ����������������������	����������������������
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�U`;
+SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(TRAILING '�\' FROM `�b�P`)
    �\�\�\�\�\	   �\�\�\�\�\
 �\�\�\�\�\	�\�\�\�\�\
@@ -361,7 +302,7 @@ SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�U`;
 �\�\�\�\�\�\�\	�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�U`;
+SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(LEADING '�\' FROM `�b�P`)
    �\�\�\�\�\	   �\�\�\�\�\
 �\�\�\�\�\	�\�\�\�\�\
@@ -372,7 +313,7 @@ SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�U`;
 �\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�U`;
+SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(BOTH '�\' FROM `�b�P`)
    �\�\�\�\�\	   �\�\�\�\�\
 �\�\�\�\�\	�\�\�\�\�\
@@ -383,7 +324,7 @@ SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�U`;
 �\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�U`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�R`;
 �b�P	TRIM(`�b�P`)
    �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\	�\�\�\�\�\
@@ -394,139 +335,45 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�U`;
 �\�\�\�\�\�\�\	�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�V`;
-�b�P	TRIM(TRAILING '�' FROM `�b�P`)
-渦慨�	渦慨�
-渦慨偽	渦慨�
-渦慨偽�	渦慨�
-渦慨偽橋	渦慨�
-怯桶患	怯桶患
-橋渦慨�	橋渦慨�
-橋怯桶患	橋怯桶患
-橋怯桶患橋�	橋怯桶患
-   渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�V`;
-�b�P	TRIM(LEADING '�' FROM `�b�P`)
-渦慨�	渦慨�
-渦慨偽	渦慨偽
-渦慨偽�	渦慨偽�
-渦慨偽橋	渦慨偽橋
-怯桶患	渦慨�
-橋渦慨�	渦慨�
-橋怯桶患	渦慨�
-橋怯桶患橋�	渦慨偽橋
-   渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�V`;
-�b�P	TRIM(BOTH '�' FROM `�b�P`)
-渦慨�	渦慨�
-渦慨偽	渦慨�
-渦慨偽�	渦慨�
-渦慨偽橋	渦慨�
-怯桶患	渦慨�
-橋渦慨�	渦慨�
-橋怯桶患	渦慨�
-橋怯桶患橋�	渦慨�
-   渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�V`;
-�b�P	TRIM(`�b�P`)
-渦慨�	渦慨�
-渦慨偽	渦慨偽
-渦慨偽�	渦慨偽�
-渦慨偽橋	渦慨偽橋
-怯桶患	怯桶患
-橋渦慨�	橋渦慨�
-橋怯桶患	橋怯桶患
-橋怯桶患橋�	橋怯桶患橋�
-   渦慨�	渦慨�
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�W`;
-�b�P	TRIM(TRAILING '��' FROM `�b�P`)
-����������	����������
-������������	����������
-��������������	����������
-����������������	����������
-������������	������������
-��������������	��������������
-����������������	����������������
-����������������������	����������������
-   ����������	   ����������
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�W`;
-�b�P	TRIM(LEADING '��' FROM `�b�P`)
-����������	����������
-������������	������������
-��������������	��������������
-����������������	����������������
-������������	����������
-��������������	����������
-����������������	����������
-����������������������	����������������
-   ����������	   ����������
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�W`;
-�b�P	TRIM(BOTH '��' FROM `�b�P`)
-����������	����������
-������������	����������
-��������������	����������
-����������������	����������
-������������	����������
-��������������	����������
-����������������	����������
-����������������������	����������
-   ����������	   ����������
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�W`;
-�b�P	TRIM(`�b�P`)
-����������	����������
-������������	������������
-��������������	��������������
-����������������	����������������
-������������	������������
-��������������	��������������
-����������������	����������������
-����������������������	����������������������
-   ����������	����������
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�X`;
-�b�P	TRIM(TRAILING '�\' FROM `�b�P`)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-   �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�X`;
-�b�P	TRIM(LEADING '�\' FROM `�b�P`)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-   �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�X`;
-�b�P	TRIM(BOTH '�\' FROM `�b�P`)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\
-   �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�X`;
-�b�P	TRIM(`�b�P`)
-�\�\�\�\�\	�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-�\�\�\�\�\�\	�\�\�\�\�\�\
-�\�\�\�\�\�\�\	�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
-�\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\�\�\�\
-   �\�\�\�\�\	�\�\�\�\�\
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P�O`;
+DROP TABLE `�s�P`;
+DROP TABLE `�s�Q`;
+DROP TABLE `�s�R`;
+SET NAMES sjis;
+SET character_set_database = sjis;
+DROP TABLE IF EXISTS `�s�P`;
+DROP TABLE IF EXISTS `�s�Q`;
+DROP TABLE IF EXISTS `�s�R`;
+CREATE TABLE `�s�P` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�Q` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+CREATE TABLE `�s�R` (`�b�P` CHAR(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>;
+INSERT INTO `�s�P` VALUES ('渦慨�');
+INSERT INTO `�s�P` VALUES ('渦慨偽');
+INSERT INTO `�s�P` VALUES ('渦慨偽�');
+INSERT INTO `�s�P` VALUES ('渦慨偽橋');
+INSERT INTO `�s�P` VALUES ('怯桶患');
+INSERT INTO `�s�P` VALUES ('橋渦慨�');
+INSERT INTO `�s�P` VALUES ('橋怯桶患');
+INSERT INTO `�s�P` VALUES ('橋怯桶患橋�');
+INSERT INTO `�s�P` VALUES ('   渦慨�   ');
+INSERT INTO `�s�Q` VALUES ('����������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('������������');
+INSERT INTO `�s�Q` VALUES ('��������������');
+INSERT INTO `�s�Q` VALUES ('����������������');
+INSERT INTO `�s�Q` VALUES ('����������������������');
+INSERT INTO `�s�Q` VALUES ('   ����������   ');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
+INSERT INTO `�s�R` VALUES ('   �\�\�\�\�\   ');
+SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(TRAILING '�' FROM `�b�P`)
 渦慨�	渦慨�
 渦慨偽	渦慨�
@@ -537,7 +384,7 @@ SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P�O`;
 橋怯桶患	橋怯桶患
 橋怯桶患橋�	橋怯桶患
    渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P�O`;
+SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(LEADING '�' FROM `�b�P`)
 渦慨�	渦慨�
 渦慨偽	渦慨偽
@@ -548,7 +395,7 @@ SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P�O`;
 橋怯桶患	渦慨�
 橋怯桶患橋�	渦慨偽橋
    渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P�O`;
+SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P`;
 �b�P	TRIM(BOTH '�' FROM `�b�P`)
 渦慨�	渦慨�
 渦慨偽	渦慨�
@@ -559,7 +406,7 @@ SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P�O`;
 橋怯桶患	渦慨�
 橋怯桶患橋�	渦慨�
    渦慨�	   渦慨�
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�O`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P`;
 �b�P	TRIM(`�b�P`)
 渦慨�	渦慨�
 渦慨偽	渦慨偽
@@ -570,7 +417,7 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�O`;
 橋怯桶患	橋怯桶患
 橋怯桶患橋�	橋怯桶患橋�
    渦慨�	渦慨�
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�P�P`;
+SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(TRAILING '��' FROM `�b�P`)
 ����������	����������
 ������������	����������
@@ -581,7 +428,7 @@ SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�P�P`;
 ����������������	����������������
 ����������������������	����������������
    ����������	   ����������
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�P�P`;
+SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(LEADING '��' FROM `�b�P`)
 ����������	����������
 ������������	������������
@@ -592,7 +439,7 @@ SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�P�P`;
 ����������������	����������
 ����������������������	����������������
    ����������	   ����������
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�P�P`;
+SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�Q`;
 �b�P	TRIM(BOTH '��' FROM `�b�P`)
 ����������	����������
 ������������	����������
@@ -603,7 +450,7 @@ SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�P�P`;
 ����������������	����������
 ����������������������	����������
    ����������	   ����������
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�P`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�Q`;
 �b�P	TRIM(`�b�P`)
 ����������	����������
 ������������	������������
@@ -614,7 +461,7 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�P`;
 ����������������	����������������
 ����������������������	����������������������
    ����������	����������
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�P�Q`;
+SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(TRAILING '�\' FROM `�b�P`)
 �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\	�\�\�\�\�\
@@ -625,7 +472,7 @@ SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�P�Q`;
 �\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
    �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�P�Q`;
+SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(LEADING '�\' FROM `�b�P`)
 �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\	�\�\�\�\�\�\
@@ -636,7 +483,7 @@ SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�P�Q`;
 �\�\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\�\�\�\
    �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�P�Q`;
+SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�R`;
 �b�P	TRIM(BOTH '�\' FROM `�b�P`)
 �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\	�\�\�\�\�\
@@ -647,7 +494,7 @@ SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�P�Q`;
 �\�\�\�\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\�\�\�\�\�\	�\�\�\�\�\
    �\�\�\�\�\	   �\�\�\�\�\
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�Q`;
+SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�R`;
 �b�P	TRIM(`�b�P`)
 �\�\�\�\�\	�\�\�\�\�\
 �\�\�\�\�\�\	�\�\�\�\�\�\
@@ -661,12 +508,3 @@ SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�Q`;
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
-DROP TABLE `�s�S`;
-DROP TABLE `�s�T`;
-DROP TABLE `�s�U`;
-DROP TABLE `�s�V`;
-DROP TABLE `�s�W`;
-DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_trim_ucs2.result b/mysql-test/suite/jp/r/jp_trim_ucs2.result
index 6ef73301a49..31ae0ab9115 100644
--- a/mysql-test/suite/jp/r/jp_trim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_trim_ucs2.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -17,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');
@@ -104,33 +100,6 @@ INSERT INTO `Ｔ９` VALUES ('丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
 INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡   ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('かあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡   ');
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
 Ｃ１	TRIM(TRAILING 'ｶ' FROM `Ｃ１`)
    ｱｲｳｴｵ	   ｱｲｳｴｵ
@@ -527,138 +496,6 @@ SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`;
 丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
 丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡丂丂丂
    龔龖龗龞龡	龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(TRAILING 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-ｶｱｲｳｴｵ	ｶｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｶｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｶｶｶｱｲｳｴｵ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(LEADING 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵｶ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵｶｶ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-ｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(BOTH 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-ｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(`Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵｶ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵｶｶ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-ｶｱｲｳｴｵ	ｶｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｶｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｶｶｶｱｲｳｴｵｶｶｶ
-   ｱｲｳｴｵ	ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(TRAILING 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえお
-あいうえおかか	あいうえお
-あいうえおかかか	あいうえお
-かあいうえお	かあいうえお
-かかあいうえお	かかあいうえお
-かかかあいうえお	かかかあいうえお
-かかかあいうえおかかか	かかかあいうえお
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(LEADING 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえおか
-あいうえおかか	あいうえおかか
-あいうえおかかか	あいうえおかかか
-かあいうえお	あいうえお
-かかあいうえお	あいうえお
-かかかあいうえお	あいうえお
-かかかあいうえおかかか	あいうえおかかか
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(BOTH 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえお
-あいうえおかか	あいうえお
-あいうえおかかか	あいうえお
-かあいうえお	あいうえお
-かかあいうえお	あいうえお
-かかかあいうえお	あいうえお
-かかかあいうえおかかか	あいうえお
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(`Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえおか
-あいうえおかか	あいうえおかか
-あいうえおかかか	あいうえおかかか
-かあいうえお	かあいうえお
-かかあいうえお	かかあいうえお
-かかかあいうえお	かかかあいうえお
-かかかあいうえおかかか	かかかあいうえおかかか
-   あいうえお	あいうえお
-SELECT `Ｃ１`,TRIM(TRAILING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(TRAILING '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡
-龔龖龗龞龡丂丂	龔龖龗龞龡
-龔龖龗龞龡丂丂丂	龔龖龗龞龡
-丂龔龖龗龞龡	丂龔龖龗龞龡
-丂丂龔龖龗龞龡	丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(LEADING '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡丂
-龔龖龗龞龡丂丂	龔龖龗龞龡丂丂
-龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-丂龔龖龗龞龡	龔龖龗龞龡
-丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(BOTH '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡
-龔龖龗龞龡丂丂	龔龖龗龞龡
-龔龖龗龞龡丂丂丂	龔龖龗龞龡
-丂龔龖龗龞龡	龔龖龗龞龡
-丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	龔龖龗龞龡
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(`Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡丂
-龔龖龗龞龡丂丂	龔龖龗龞龡丂丂
-龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-丂龔龖龗龞龡	丂龔龖龗龞龡
-丂丂龔龖龗龞龡	丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡丂丂丂
-   龔龖龗龞龡	龔龖龗龞龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -668,6 +505,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_trim_ujis.result b/mysql-test/suite/jp/r/jp_trim_ujis.result
index b79a1b24a37..c90d1a50308 100644
--- a/mysql-test/suite/jp/r/jp_trim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_trim_ujis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');
@@ -103,33 +99,6 @@ INSERT INTO `Ｔ９` VALUES ('丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
 INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡   ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('かあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡   ');
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
 Ｃ１	TRIM(TRAILING 'ｶ' FROM `Ｃ１`)
    ｱｲｳｴｵ	   ｱｲｳｴｵ
@@ -526,138 +495,6 @@ SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`;
 丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
 丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡丂丂丂
    龔龖龗龞龡	龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(TRAILING 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-ｶｱｲｳｴｵ	ｶｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｶｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｶｶｶｱｲｳｴｵ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(LEADING 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵｶ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵｶｶ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-ｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(BOTH 'ｶ' FROM `Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-ｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｱｲｳｴｵ
-   ｱｲｳｴｵ	   ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	TRIM(`Ｃ１`)
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴｵｶ	ｱｲｳｴｵｶ
-ｱｲｳｴｵｶｶ	ｱｲｳｴｵｶｶ
-ｱｲｳｴｵｶｶｶ	ｱｲｳｴｵｶｶｶ
-ｶｱｲｳｴｵ	ｶｱｲｳｴｵ
-ｶｶｱｲｳｴｵ	ｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵ	ｶｶｶｱｲｳｴｵ
-ｶｶｶｱｲｳｴｵｶｶｶ	ｶｶｶｱｲｳｴｵｶｶｶ
-   ｱｲｳｴｵ	ｱｲｳｴｵ
-SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(TRAILING 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえお
-あいうえおかか	あいうえお
-あいうえおかかか	あいうえお
-かあいうえお	かあいうえお
-かかあいうえお	かかあいうえお
-かかかあいうえお	かかかあいうえお
-かかかあいうえおかかか	かかかあいうえお
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(LEADING 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえおか
-あいうえおかか	あいうえおかか
-あいうえおかかか	あいうえおかかか
-かあいうえお	あいうえお
-かかあいうえお	あいうえお
-かかかあいうえお	あいうえお
-かかかあいうえおかかか	あいうえおかかか
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(BOTH 'か' FROM `Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえお
-あいうえおかか	あいうえお
-あいうえおかかか	あいうえお
-かあいうえお	あいうえお
-かかあいうえお	あいうえお
-かかかあいうえお	あいうえお
-かかかあいうえおかかか	あいうえお
-   あいうえお	   あいうえお
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	TRIM(`Ｃ１`)
-あいうえお	あいうえお
-あいうえおか	あいうえおか
-あいうえおかか	あいうえおかか
-あいうえおかかか	あいうえおかかか
-かあいうえお	かあいうえお
-かかあいうえお	かかあいうえお
-かかかあいうえお	かかかあいうえお
-かかかあいうえおかかか	かかかあいうえおかかか
-   あいうえお	あいうえお
-SELECT `Ｃ１`,TRIM(TRAILING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(TRAILING '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡
-龔龖龗龞龡丂丂	龔龖龗龞龡
-龔龖龗龞龡丂丂丂	龔龖龗龞龡
-丂龔龖龗龞龡	丂龔龖龗龞龡
-丂丂龔龖龗龞龡	丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(LEADING '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡丂
-龔龖龗龞龡丂丂	龔龖龗龞龡丂丂
-龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-丂龔龖龗龞龡	龔龖龗龞龡
-丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(BOTH '丂' FROM `Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡
-龔龖龗龞龡丂丂	龔龖龗龞龡
-龔龖龗龞龡丂丂丂	龔龖龗龞龡
-丂龔龖龗龞龡	龔龖龗龞龡
-丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡	龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	龔龖龗龞龡
-   龔龖龗龞龡	   龔龖龗龞龡
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	TRIM(`Ｃ１`)
-龔龖龗龞龡	龔龖龗龞龡
-龔龖龗龞龡丂	龔龖龗龞龡丂
-龔龖龗龞龡丂丂	龔龖龗龞龡丂丂
-龔龖龗龞龡丂丂丂	龔龖龗龞龡丂丂丂
-丂龔龖龗龞龡	丂龔龖龗龞龡
-丂丂龔龖龗龞龡	丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡	丂丂丂龔龖龗龞龡
-丂丂丂龔龖龗龞龡丂丂丂	丂丂丂龔龖龗龞龡丂丂丂
-   龔龖龗龞龡	龔龖龗龞龡
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -667,6 +504,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_trim_utf8.result b/mysql-test/suite/jp/r/jp_trim_utf8.result
index 99fb785e495..4f4849c9f3c 100644
--- a/mysql-test/suite/jp/r/jp_trim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_trim_utf8.result
@@ -7,7 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔居酋');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔居酋鐔�');
@@ -103,33 +99,6 @@ INSERT INTO `鐚器��` VALUES ('筝�筝�蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
 INSERT INTO `鐚器��` VALUES ('   蘊�蘊�蘊�蘊�蘊�   ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋鐔駈酋');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈襲鐔駕蹴鐔器週');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔駈襲鐔駕蹴鐔器週');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('   鐔縁讐鐔鰹輯鐔�   ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('   ���������������   ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('   蘊�蘊�蘊�蘊�蘊�   ');
 SELECT `鐚ｏ��`,TRIM(TRAILING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
 鐚ｏ��	TRIM(TRAILING '鐔�' FROM `鐚ｏ��`)
    鐔縁讐鐔鰹輯鐔�	   鐔縁讐鐔鰹輯鐔�
@@ -526,138 +495,6 @@ SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��`;
 筝�筝�筝�蘊�蘊�蘊�蘊�蘊�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊�
 筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�
    蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-SELECT `鐚ｏ��`,TRIM(TRAILING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(TRAILING '鐔�' FROM `鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔駈酋	鐔縁讐鐔鰹輯鐔�
-鐔駈襲鐔駕蹴鐔器週	鐔駈襲鐔駕蹴鐔器週
-鐔駈酋鐔縁讐鐔鰹輯鐔�	鐔駈酋鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週	鐔駈酋鐔駈襲鐔駕蹴鐔器週
-鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�	鐔駈酋鐔駈襲鐔駕蹴鐔器週
-   鐔縁讐鐔鰹輯鐔�	   鐔縁讐鐔鰹輯鐔�
-SELECT `鐚ｏ��`,TRIM(LEADING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(LEADING '鐔�' FROM `鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋	鐔縁讐鐔鰹輯鐔居酋
-鐔縁讐鐔鰹輯鐔居酋鐔�	鐔縁讐鐔鰹輯鐔居酋鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔駈酋	鐔縁讐鐔鰹輯鐔居酋鐔駈酋
-鐔駈襲鐔駕蹴鐔器週	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�	鐔縁讐鐔鰹輯鐔居酋鐔駈酋
-   鐔縁讐鐔鰹輯鐔�	   鐔縁讐鐔鰹輯鐔�
-SELECT `鐚ｏ��`,TRIM(BOTH '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(BOTH '鐔�' FROM `鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔駈酋	鐔縁讐鐔鰹輯鐔�
-鐔駈襲鐔駕蹴鐔器週	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週	鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�	鐔縁讐鐔鰹輯鐔�
-   鐔縁讐鐔鰹輯鐔�	   鐔縁讐鐔鰹輯鐔�
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(`鐚ｏ��`)
-鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-鐔縁讐鐔鰹輯鐔居酋	鐔縁讐鐔鰹輯鐔居酋
-鐔縁讐鐔鰹輯鐔居酋鐔�	鐔縁讐鐔鰹輯鐔居酋鐔�
-鐔縁讐鐔鰹輯鐔居酋鐔駈酋	鐔縁讐鐔鰹輯鐔居酋鐔駈酋
-鐔駈襲鐔駕蹴鐔器週	鐔駈襲鐔駕蹴鐔器週
-鐔駈酋鐔縁讐鐔鰹輯鐔�	鐔駈酋鐔縁讐鐔鰹輯鐔�
-鐔駈酋鐔駈襲鐔駕蹴鐔器週	鐔駈酋鐔駈襲鐔駕蹴鐔器週
-鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�	鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�
-   鐔縁讐鐔鰹輯鐔�	鐔縁讐鐔鰹輯鐔�
-SELECT `鐚ｏ��`,TRIM(TRAILING '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(TRAILING '���' FROM `鐚ｏ��`)
-���������������	���������������
-������������������	���������������
-���������������������	���������������
-������������������������	���������������
-������������������	������������������
-���������������������	���������������������
-������������������������	������������������������
-���������������������������������	������������������������
-   ���������������	   ���������������
-SELECT `鐚ｏ��`,TRIM(LEADING '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(LEADING '���' FROM `鐚ｏ��`)
-���������������	���������������
-������������������	������������������
-���������������������	���������������������
-������������������������	������������������������
-������������������	���������������
-���������������������	���������������
-������������������������	���������������
-���������������������������������	������������������������
-   ���������������	   ���������������
-SELECT `鐚ｏ��`,TRIM(BOTH '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(BOTH '���' FROM `鐚ｏ��`)
-���������������	���������������
-������������������	���������������
-���������������������	���������������
-������������������������	���������������
-������������������	���������������
-���������������������	���������������
-������������������������	���������������
-���������������������������������	���������������
-   ���������������	   ���������������
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(`鐚ｏ��`)
-���������������	���������������
-������������������	������������������
-���������������������	���������������������
-������������������������	������������������������
-������������������	������������������
-���������������������	���������������������
-������������������������	������������������������
-���������������������������������	���������������������������������
-   ���������������	���������������
-SELECT `鐚ｏ��`,TRIM(TRAILING '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(TRAILING '筝�' FROM `鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��筝�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊�
-筝�蘊�蘊�蘊�蘊�蘊�	筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�蘊�蘊�蘊�蘊�蘊�	筝�筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊�
-   蘊�蘊�蘊�蘊�蘊�	   蘊�蘊�蘊�蘊�蘊�
-SELECT `鐚ｏ��`,TRIM(LEADING '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(LEADING '筝�' FROM `鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��	蘊�蘊�蘊�蘊�蘊＞��
-蘊�蘊�蘊�蘊�蘊＞��筝�	蘊�蘊�蘊�蘊�蘊＞��筝�
-蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊＞��筝�筝�
-筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊＞��筝�筝�
-   蘊�蘊�蘊�蘊�蘊�	   蘊�蘊�蘊�蘊�蘊�
-SELECT `鐚ｏ��`,TRIM(BOTH '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(BOTH '筝�' FROM `鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��筝�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊�
-筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊�
-   蘊�蘊�蘊�蘊�蘊�	   蘊�蘊�蘊�蘊�蘊�
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-鐚ｏ��	TRIM(`鐚ｏ��`)
-蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
-蘊�蘊�蘊�蘊�蘊＞��	蘊�蘊�蘊�蘊�蘊＞��
-蘊�蘊�蘊�蘊�蘊＞��筝�	蘊�蘊�蘊�蘊�蘊＞��筝�
-蘊�蘊�蘊�蘊�蘊＞��筝�筝�	蘊�蘊�蘊�蘊�蘊＞��筝�筝�
-筝�蘊�蘊�蘊�蘊�蘊�	筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�蘊�蘊�蘊�蘊�蘊�	筝�筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊�
-筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�	筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�
-   蘊�蘊�蘊�蘊�蘊�	蘊�蘊�蘊�蘊�蘊�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -667,6 +504,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_union_ujis.result b/mysql-test/suite/jp/r/jp_union_ujis.result
index 4b74c570ffe..00dc868b8e2 100644
--- a/mysql-test/suite/jp/r/jp_union_ujis.result
+++ b/mysql-test/suite/jp/r/jp_union_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -202,104 +199,9 @@ SELECT * FROM `Ｔ１` UNION SELECT REPEAT(`Ｃ１`,5) FROM `Ｔ２` ORDER BY `Ｃ１`;
 DROP TABLE `Ｔ１` ;
 DROP TABLE `Ｔ２` ;
 DROP TABLE `Ｔ３` ;
-CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-INSERT INTO `Ｔ１` VALUES('ｱ'),('ｱ'),('あ'),('あ'),('龔'),('龔');
-INSERT INTO `Ｔ２` VALUES('ｲ'),('ｲ'),('い'),('い'),('龖'),('龖');
-INSERT INTO `Ｔ３` VALUES('ｳ'),('ｳ'),('う'),('う'),('龗'),('龗');
-SELECT * FROM `Ｔ１` UNION DISTINCT SELECT * FROM `Ｔ２` ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲ
-龔
-龖
-あ
-い
-SELECT * FROM `Ｔ１` UNION ALL SELECT * FROM `Ｔ２` ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｱ
-ｲ
-ｲ
-龔
-龔
-龖
-龖
-あ
-あ
-い
-い
-(SELECT * FROM `Ｔ１`) UNION (SELECT * FROM `Ｔ２`) UNION (SELECT 'う') ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲ
-龔
-龖
-あ
-い
-う
-(SELECT 'う' AS `Ｃ１`) UNION (SELECT * FROM `Ｔ１`) UNION (SELECT * FROM `Ｔ２`) ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲ
-龔
-龖
-あ
-い
-う
-SELECT `Ｃ１`, COUNT(*) FROM `Ｔ１` GROUP BY `Ｃ１` UNION
-SELECT `Ｃ１`, COUNT(*) FROM `Ｔ２` GROUP BY `Ｃ１` ORDER BY `Ｃ１`;
-Ｃ１	COUNT(*)
-ｱ	2
-ｲ	2
-龔	2
-龖	2
-あ	2
-い	2
-SELECT * FROM `Ｔ１` UNION DISTINCT
-SELECT * FROM `Ｔ２` UNION ALL
-SELECT * FROM `Ｔ３` ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲ
-ｳ
-ｳ
-龔
-龖
-龗
-龗
-あ
-い
-う
-う
-SELECT * FROM `Ｔ１` UNION ALL
-SELECT * FROM `Ｔ２` UNION DISTINCT
-SELECT * FROM `Ｔ３` ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲ
-ｳ
-龔
-龖
-龗
-あ
-い
-う
-SELECT * FROM `Ｔ１` UNION SELECT REPEAT(`Ｃ１`,5) FROM `Ｔ２` ORDER BY `Ｃ１`;
-Ｃ１
-ｱ
-ｲｲｲｲｲ
-龔
-龖龖龖龖龖
-あ
-いいいいい
-DROP TABLE `Ｔ１` ;
-DROP TABLE `Ｔ２` ;
-DROP TABLE `Ｔ３` ;
-CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB;
-CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB;
-CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB;
+CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES('ｱ'),('ｱ'),('あ'),('あ'),('龔'),('龔');
 INSERT INTO `Ｔ２` VALUES('ｲ'),('ｲ'),('い'),('い'),('龖'),('龖');
 INSERT INTO `Ｔ３` VALUES('ｳ'),('ｳ'),('う'),('う'),('龗'),('龗');
diff --git a/mysql-test/suite/jp/r/jp_update_sjis.result b/mysql-test/suite/jp/r/jp_update_sjis.result
index 65151cc7021..08d250a12e3 100644
--- a/mysql-test/suite/jp/r/jp_update_sjis.result
+++ b/mysql-test/suite/jp/r/jp_update_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
 INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
@@ -33,9 +27,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 UPDATE `�s�P` SET `�b�P` = ('況弦�');
 UPDATE `�s�Q` SET `�b�P` = ('����������');
 UPDATE `�s�R` SET `�b�P` = ('�\�\�\�\�\');
@@ -45,9 +36,6 @@ UPDATE `�s�U` SET `�b�P` = ('�\�\�\�\�\');
 UPDATE `�s�V` SET `�b�P` = ('況弦�');
 UPDATE `�s�W` SET `�b�P` = ('����������');
 UPDATE `�s�X` SET `�b�P` = ('�\�\�\�\�\');
-UPDATE `�s�P�O` SET `�b�P` = ('況弦�');
-UPDATE `�s�P�P` SET `�b�P` = ('����������');
-UPDATE `�s�P�Q` SET `�b�P` = ('�\�\�\�\�\');
 SELECT * FROM `�s�P`;
 �b�P
 況弦�
@@ -75,15 +63,6 @@ SELECT * FROM `�s�W`;
 SELECT * FROM `�s�X`;
 �b�P
 �\�\�\�\�\
-SELECT * FROM `�s�P�O`;
-�b�P
-況弦�
-SELECT * FROM `�s�P�P`;
-�b�P
-����������
-SELECT * FROM `�s�P�Q`;
-�b�P
-�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -93,6 +72,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_update_ucs2.result b/mysql-test/suite/jp/r/jp_update_ucs2.result
index 2796958ac3e..998126a4e4c 100644
--- a/mysql-test/suite/jp/r/jp_update_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_update_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -34,9 +28,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ３` SET `Ｃ１` = ('齗齘齚齝齞');
@@ -46,9 +37,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 SELECT * FROM `Ｔ１`;
 Ｃ１
 ｶｷｸｹｺ
@@ -76,15 +64,6 @@ SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 Ｃ１
 齗齘齚齝齞
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｶｷｸｹｺ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-かきくけこ
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-齗齘齚齝齞
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -94,6 +73,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_update_ujis.result b/mysql-test/suite/jp/r/jp_update_ujis.result
index e9633d14f0c..f976436030b 100644
--- a/mysql-test/suite/jp/r/jp_update_ujis.result
+++ b/mysql-test/suite/jp/r/jp_update_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ３` SET `Ｃ１` = ('齗齘齚齝齞');
@@ -45,9 +36,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 SELECT * FROM `Ｔ１`;
 Ｃ１
 ｶｷｸｹｺ
@@ -75,15 +63,6 @@ SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 Ｃ１
 齗齘齚齝齞
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｶｷｸｹｺ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-かきくけこ
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-齗齘齚齝齞
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -93,6 +72,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_update_utf8.result b/mysql-test/suite/jp/r/jp_update_utf8.result
index f690d2f0247..15d3214534b 100644
--- a/mysql-test/suite/jp/r/jp_update_utf8.result
+++ b/mysql-test/suite/jp/r/jp_update_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
@@ -33,9 +27,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('���������������');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
@@ -45,9 +36,6 @@ UPDATE `鐚器��` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('���������������');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('���������������');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
 SELECT * FROM `鐚器��`;
 鐚ｏ��
 鐔駈酬鐔醐醜鐔�
@@ -75,15 +63,6 @@ SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 鐚ｏ��
 藹�藹�藹�藹�藹�
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-鐔駈酬鐔醐醜鐔�
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-���������������
-SELECT * FROM `鐚器��鐚�`;
-鐚ｏ��
-藹�藹�藹�藹�藹�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -93,6 +72,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/r/jp_where_sjis.result b/mysql-test/suite/jp/r/jp_where_sjis.result
index a3cbc24c113..536d2a8d330 100644
--- a/mysql-test/suite/jp/r/jp_where_sjis.result
+++ b/mysql-test/suite/jp/r/jp_where_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT * FROM `�s�P` WHERE `�b�P` = '葦桶患況弦沙悉梢';
 �b�P
 葦桶患況弦沙悉梢
@@ -63,23 +54,15 @@ SELECT * FROM `�s�W` WHERE `�b�P` = '�E��������������������������������������';
 SELECT * FROM `�s�X` WHERE `�b�P` = '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 �b�P
 �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�O` WHERE `�b�P` = '葦桶患況弦沙悉梢';
-�b�P
-葦桶患況弦沙悉梢
-SELECT * FROM `�s�P�P` WHERE `�b�P` = '�E��������������������������������������';
-�b�P
-�E��������������������������������������
-SELECT * FROM `�s�P�Q` WHERE `�b�P` = '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
 CREATE TABLE t1(c1 char(1)) default charset = sjis engine=innodb;
 CREATE TABLE t2(c1 char(1)) default charset = sjis engine=myisam;
-CREATE TABLE t3(c1 char(1)) default charset = sjis engine=heap;
-CREATE TABLE t4(c1 char(1)) default charset = sjis engine=bdb;
+CREATE TABLE t3(c1 char(1)) default charset = sjis engine=MEMORY;
 INSERT INTO t1 VALUES('�S'),('�s');
 INSERT INTO t2 VALUES('�S'),('�s');
 INSERT INTO t3 VALUES('�S'),('�s');
-INSERT INTO t4 VALUES('�S'),('�s');
 SELECT * FROM t1 WHERE c1 = '�S';
 c1
 �S
@@ -89,9 +72,6 @@ c1
 SELECT * FROM t3 WHERE c1 = '�S';
 c1
 �S
-SELECT * FROM t4 WHERE c1 = '�S';
-c1
-�S
 SELECT * FROM t1 WHERE c1 = '�s';
 c1
 �s
@@ -101,9 +81,9 @@ c1
 SELECT * FROM t3 WHERE c1 = '�s';
 c1
 �s
-SELECT * FROM t4 WHERE c1 = '�s';
-c1
-�s
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -113,6 +93,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/r/jp_where_ucs2.result b/mysql-test/suite/jp/r/jp_where_ucs2.result
index a05b1da9b68..b581ba017a0 100644
--- a/mysql-test/suite/jp/r/jp_where_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_where_ucs2.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -91,28 +85,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 Ｃ１
 ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
@@ -140,15 +112,6 @@ SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 Ｃ１
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -158,6 +121,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_where_ujis.result b/mysql-test/suite/jp/r/jp_where_ujis.result
index b13b8a10ef8..0c4621c3a33 100644
--- a/mysql-test/suite/jp/r/jp_where_ujis.result
+++ b/mysql-test/suite/jp/r/jp_where_ujis.result
@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 Ｃ１
 ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
@@ -63,15 +54,6 @@ SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 Ｃ１
 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-Ｃ１
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-Ｃ１
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-Ｃ１
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -81,6 +63,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/r/jp_where_utf8.result b/mysql-test/suite/jp/r/jp_where_utf8.result
index d69aaf8715d..3adb5733dbf 100644
--- a/mysql-test/suite/jp/r/jp_where_utf8.result
+++ b/mysql-test/suite/jp/r/jp_where_utf8.result
@@ -7,9 +7,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
 鐚ｏ��
 鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
@@ -63,15 +54,6 @@ SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '��祉�����������������������������������
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 鐚ｏ��
 藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
-鐚ｏ��
-鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '��祉��������������������������������������������������������';
-鐚ｏ��
-��祉��������������������������������������������������������
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
-鐚ｏ��
-藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -81,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/disabled.def b/mysql-test/suite/jp/t/disabled.def
new file mode 100644
index 00000000000..8c4d862ebde
--- /dev/null
+++ b/mysql-test/suite/jp/t/disabled.def
@@ -0,0 +1,13 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+jp_convert_sjis      : Bug#36597 Testsuite "jp": Suspicious results for some tests
+jp_select_sjis       : Bug#36597 Testsuite "jp": Suspicious results for some tests
diff --git a/mysql-test/suite/jp/t/jp_alter_sjis.test b/mysql-test/suite/jp/t/jp_alter_sjis.test
index b7b31862599..ec3abf01b8a 100644
--- a/mysql-test/suite/jp/t/jp_alter_sjis.test
+++ b/mysql-test/suite/jp/t/jp_alter_sjis.test
@@ -1,6 +1,8 @@
+--source include/have_sjis.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;
+--source include/have_innodb.inc
 --disable_warnings
 DROP TABLE IF EXISTS `臼�`;
 DROP TABLE IF EXISTS `臆�`;
@@ -217,15 +219,15 @@ DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
 
 #
-# Test HEAP
+# Test MEMORY
 #
 
-CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
 
 INSERT INTO `臼�` VALUES ('臼臼�'),('臆臆�'),('崖崖�');
 INSERT INTO `������` VALUES ('����������'),('����������'),('����������');
@@ -314,103 +316,3 @@ DROP TABLE `������`;
 DROP TABLE `������`;
 DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
-
-#
-# Test BDB
-#
-
-CREATE TABLE `臼�`(`祁�` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `臆�`(`更�` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-
-INSERT INTO `臼�` VALUES ('臼臼�'),('臆臆�'),('崖崖�');
-INSERT INTO `������` VALUES ('����������'),('����������'),('����������');
-INSERT INTO `�\�\�\` VALUES ('�\�\�\�\�\'),('�\�\�\�\�\'),('�\�\�\�\�\');
-
-ALTER TABLE `臼�` ADD `橋�` char(1) FIRST;
-ALTER TABLE `臼�` ADD `幻�` char(1) AFTER `祁�`;
-ALTER TABLE `臼�` ADD `更�` char(1);
-ALTER TABLE `臼�` ADD INDEX (`橋�`);
-ALTER TABLE `臼�` ADD PRIMARY KEY (`祁�`);
-#Multiple NULL fields are not allowed in BDB
-#ALTER TABLE `臼�` ADD UNIQUE (`幻�`);
-#ALTER TABLE `臼�` ADD FOREIGN KEY (`更�`) REFERENCES `臆�`(`更�`);
-ALTER TABLE `臼�` CHANGE `橋�` `橋` char(1);
-ALTER TABLE `臼�` MODIFY `祁�` char(6);
-
-SELECT * FROM `臼�`;
-DESC `臼�`;
-SHOW CREATE TABLE `臼�`;
-
-ALTER TABLE `臼�` DROP INDEX `橋�`;
-ALTER TABLE `臼�` DROP PRIMARY KEY;
-#ALTER TABLE `臼�` DROP INDEX `幻�`;
-#ALTER TABLE `臼�` DROP FOREIGN KEY `更�`;
-ALTER TABLE `臼�` DROP `橋`;
-ALTER TABLE `臼�` DROP `幻�`;
-ALTER TABLE `臼�` DROP `更�`;
-SELECT * FROM `臼�`;
-DESC `臼�`;
-SHOW CREATE TABLE `臼�`;
-
-ALTER TABLE `������` ADD `������` char(1) FIRST;
-ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
-ALTER TABLE `������` ADD `������` char(1);
-ALTER TABLE `������` ADD INDEX (`������`);
-ALTER TABLE `������` ADD PRIMARY KEY (`������`);
-#ALTER TABLE `������` ADD UNIQUE (`������`);
-#ALTER TABLE `������` ADD FOREIGN KEY (`������`) REFERENCES `������`(`������`);
-ALTER TABLE `������` CHANGE `������` `����` char(1);
-ALTER TABLE `������` MODIFY `������` char(6);
-
-SELECT * FROM `������`;
-DESC `������`;
-SHOW CREATE TABLE `������`;
-
-ALTER TABLE `������` DROP INDEX `������`;
-ALTER TABLE `������` DROP PRIMARY KEY;
-#ALTER TABLE `������` DROP INDEX `������`;
-#ALTER TABLE `������` DROP FOREIGN KEY `������`;
-ALTER TABLE `������` DROP `����`;
-ALTER TABLE `������` DROP `������`;
-ALTER TABLE `������` DROP `������`;
-
-SELECT * FROM `������`;
-DESC `������`;
-SHOW CREATE TABLE `������`;
-
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
-ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
-ALTER TABLE `�\�\�\` ADD INDEX (`�\�\�\`);
-ALTER TABLE `�\�\�\` ADD PRIMARY KEY (`�\�\�\`);
-#ALTER TABLE `�\�\�\` ADD UNIQUE (`�\�\�\`);
-#ALTER TABLE `�\�\�\` ADD FOREIGN KEY (`�\�\�\`) REFERENCES `�\�\�\`(`�\�\�\`);
-ALTER TABLE `�\�\�\` CHANGE `�\�\�\` `�\�\` char(1);
-ALTER TABLE `�\�\�\` MODIFY `�\�\�\` char(6);
-
-SELECT * FROM `�\�\�\`;
-DESC `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-
-ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
-ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
-#ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
-#ALTER TABLE `�\�\�\` DROP FOREIGN KEY `�\�\�\`;
-ALTER TABLE `�\�\�\` DROP `�\�\`;
-ALTER TABLE `�\�\�\` DROP `�\�\�\`;
-ALTER TABLE `�\�\�\` DROP `�\�\�\`;
-
-SELECT * FROM `�\�\�\`;
-DESC `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-
-DROP TABLE `臼�`;
-DROP TABLE `臆�`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
diff --git a/mysql-test/suite/jp/t/jp_alter_ucs2.test b/mysql-test/suite/jp/t/jp_alter_ucs2.test
index 6c5b3132edf..24cfed06e3e 100644
--- a/mysql-test/suite/jp/t/jp_alter_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_alter_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
@@ -220,15 +221,15 @@ DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
 
 #
-# Test HEAP
+# Test MEMORY
 #
 
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 
 INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
@@ -317,103 +318,3 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-
-#
-# Test BDB
-#
-
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-
-INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-
-ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST;
-ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`;
-ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1);
-ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`);
-ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`);
-#Multiple NULL fields are not allowed in BDB
-#ALTER TABLE `ｱｱｱ` ADD UNIQUE (`ｸｸｸ`);
-#ALTER TABLE `ｱｱｱ` ADD FOREIGN KEY (`ｹｹｹ`) REFERENCES `ｲｲｲ`(`ｹｹｹ`);
-ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1);
-ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6);
-
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
-#ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
-#ALTER TABLE `ｱｱｱ` DROP FOREIGN KEY `ｹｹｹ`;
-ALTER TABLE `ｱｱｱ` DROP `ｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`;
-ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`;
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-#ALTER TABLE `あああ` ADD UNIQUE (`くくく`);
-#ALTER TABLE `あああ` ADD FOREIGN KEY (`けけけ`) REFERENCES `いいい`(`けけけ`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-#ALTER TABLE `あああ` DROP INDEX `くくく`;
-#ALTER TABLE `あああ` DROP FOREIGN KEY `けけけ`;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-#ALTER TABLE `龖龖龖` ADD UNIQUE (`丅丅丅`);
-#ALTER TABLE `龖龖龖` ADD FOREIGN KEY (`乚乚乚`) REFERENCES `龗龗龗`(`乚乚乚`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-#ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
-#ALTER TABLE `龖龖龖` DROP FOREIGN KEY `乚乚乚`;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test
index d388d20c49b..e397cf66a50 100644
--- a/mysql-test/suite/jp/t/jp_alter_ujis.test
+++ b/mysql-test/suite/jp/t/jp_alter_ujis.test
@@ -1,4 +1,6 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
+
 
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
@@ -219,15 +221,15 @@ DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
 
 #
-# Test HEAP
+# Test MEMORY
 #
 
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=MEMORY;
 
 INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
@@ -316,103 +318,3 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-
-#
-# Test BDB
-#
-
-CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = ujis engine=BDB;
-
-INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-
-ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST;
-ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`;
-ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1);
-ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`);
-ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`);
-#Multiple NULL fields are not allowed in BDB
-#ALTER TABLE `ｱｱｱ` ADD UNIQUE (`ｸｸｸ`);
-#ALTER TABLE `ｱｱｱ` ADD FOREIGN KEY (`ｹｹｹ`) REFERENCES `ｲｲｲ`(`ｹｹｹ`);
-ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1);
-ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6);
-
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
-#ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
-#ALTER TABLE `ｱｱｱ` DROP FOREIGN KEY `ｹｹｹ`;
-ALTER TABLE `ｱｱｱ` DROP `ｶｶ`;
-ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`;
-ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`;
-SELECT * FROM `ｱｱｱ`;
-DESC `ｱｱｱ`;
-SHOW CREATE TABLE `ｱｱｱ`;
-
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-#ALTER TABLE `あああ` ADD UNIQUE (`くくく`);
-#ALTER TABLE `あああ` ADD FOREIGN KEY (`けけけ`) REFERENCES `いいい`(`けけけ`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-#ALTER TABLE `あああ` DROP INDEX `くくく`;
-#ALTER TABLE `あああ` DROP FOREIGN KEY `けけけ`;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-
-SELECT * FROM `あああ`;
-DESC `あああ`;
-SHOW CREATE TABLE `あああ`;
-
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-#ALTER TABLE `龖龖龖` ADD UNIQUE (`丅丅丅`);
-#ALTER TABLE `龖龖龖` ADD FOREIGN KEY (`乚乚乚`) REFERENCES `龗龗龗`(`乚乚乚`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-#ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
-#ALTER TABLE `龖龖龖` DROP FOREIGN KEY `乚乚乚`;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-
-SELECT * FROM `龖龖龖`;
-DESC `龖龖龖`;
-SHOW CREATE TABLE `龖龖龖`;
-
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
diff --git a/mysql-test/suite/jp/t/jp_alter_utf8.test b/mysql-test/suite/jp/t/jp_alter_utf8.test
index 6771343f38f..fc98e20acfe 100644
--- a/mysql-test/suite/jp/t/jp_alter_utf8.test
+++ b/mysql-test/suite/jp/t/jp_alter_utf8.test
@@ -11,9 +11,12 @@ DROP TABLE IF EXISTS `蘊�蘊�蘊�`;
 # Test altering table with Japanese characters in utf8 encoding
 #
 
+--source include/have_utf8.inc
 SET NAMES utf8;
 SET character_set_database = utf8;
 
+--source include/have_innodb.inc
+
 #
 # Test InnoDB
 #
@@ -217,15 +220,15 @@ DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊�蘊�蘊�`;
 
 #
-# Test HEAP
+# Test MEMORY
 #
 
-CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
 
 INSERT INTO `鐔縁襲鐔�` VALUES ('鐔縁襲鐔縁襲鐔�'),('鐔駕讐鐔駕讐鐔�'),('鐔鰹蹴鐔鰹蹴鐔�');
 INSERT INTO `���������` VALUES ('���������������'),('���������������'),('���������������');
@@ -314,103 +317,3 @@ DROP TABLE `���������`;
 DROP TABLE `���������`;
 DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊�蘊�蘊�`;
-
-#
-# Test BDB
-#
-
-CREATE TABLE `鐔縁襲鐔�`(`鐔件酬鐔�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `鐔駕讐鐔�`(`鐔刻醜鐔�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `���������`(`���������` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `蘊�蘊�蘊�`(`箙�箙�箙�` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-
-INSERT INTO `鐔縁襲鐔�` VALUES ('鐔縁襲鐔縁襲鐔�'),('鐔駕讐鐔駕讐鐔�'),('鐔鰹蹴鐔鰹蹴鐔�');
-INSERT INTO `���������` VALUES ('���������������'),('���������������'),('���������������');
-INSERT INTO `蘊�蘊�蘊�` VALUES ('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�'),('筝�筝�筝�筝�筝�');
-
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔駈酋鐔�` char(1) FIRST;
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔醐集鐔�` char(1) AFTER `鐔件酬鐔�`;
-ALTER TABLE `鐔縁襲鐔�` ADD `鐔刻醜鐔�` char(1);
-ALTER TABLE `鐔縁襲鐔�` ADD INDEX (`鐔駈酋鐔�`);
-ALTER TABLE `鐔縁襲鐔�` ADD PRIMARY KEY (`鐔件酬鐔�`);
-#Multiple NULL fields are not allowed in BDB
-#ALTER TABLE `鐔縁襲鐔�` ADD UNIQUE (`鐔醐集鐔�`);
-#ALTER TABLE `鐔縁襲鐔�` ADD FOREIGN KEY (`鐔刻醜鐔�`) REFERENCES `鐔駕讐鐔�`(`鐔刻醜鐔�`);
-ALTER TABLE `鐔縁襲鐔�` CHANGE `鐔駈酋鐔�` `鐔駈酋` char(1);
-ALTER TABLE `鐔縁襲鐔�` MODIFY `鐔件酬鐔�` char(6);
-
-SELECT * FROM `鐔縁襲鐔�`;
-DESC `鐔縁襲鐔�`;
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-
-ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔駈酋鐔�`;
-ALTER TABLE `鐔縁襲鐔�` DROP PRIMARY KEY;
-#ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔醐集鐔�`;
-#ALTER TABLE `鐔縁襲鐔�` DROP FOREIGN KEY `鐔刻醜鐔�`;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔駈酋`;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔醐集鐔�`;
-ALTER TABLE `鐔縁襲鐔�` DROP `鐔刻醜鐔�`;
-SELECT * FROM `鐔縁襲鐔�`;
-DESC `鐔縁襲鐔�`;
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-
-ALTER TABLE `���������` ADD `���������` char(1) FIRST;
-ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
-ALTER TABLE `���������` ADD `���������` char(1);
-ALTER TABLE `���������` ADD INDEX (`���������`);
-ALTER TABLE `���������` ADD PRIMARY KEY (`���������`);
-#ALTER TABLE `���������` ADD UNIQUE (`���������`);
-#ALTER TABLE `���������` ADD FOREIGN KEY (`���������`) REFERENCES `���������`(`���������`);
-ALTER TABLE `���������` CHANGE `���������` `������` char(1);
-ALTER TABLE `���������` MODIFY `���������` char(6);
-
-SELECT * FROM `���������`;
-DESC `���������`;
-SHOW CREATE TABLE `���������`;
-
-ALTER TABLE `���������` DROP INDEX `���������`;
-ALTER TABLE `���������` DROP PRIMARY KEY;
-#ALTER TABLE `���������` DROP INDEX `���������`;
-#ALTER TABLE `���������` DROP FOREIGN KEY `���������`;
-ALTER TABLE `���������` DROP `������`;
-ALTER TABLE `���������` DROP `���������`;
-ALTER TABLE `���������` DROP `���������`;
-
-SELECT * FROM `���������`;
-DESC `���������`;
-SHOW CREATE TABLE `���������`;
-
-ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
-ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
-ALTER TABLE `蘊�蘊�蘊�` ADD INDEX (`筝�筝�筝�`);
-ALTER TABLE `蘊�蘊�蘊�` ADD PRIMARY KEY (`筝�筝�筝�`);
-#ALTER TABLE `蘊�蘊�蘊�` ADD UNIQUE (`筝�筝�筝�`);
-#ALTER TABLE `蘊�蘊�蘊�` ADD FOREIGN KEY (`箙�箙�箙�`) REFERENCES `蘊�蘊�蘊�`(`箙�箙�箙�`);
-ALTER TABLE `蘊�蘊�蘊�` CHANGE `筝�筝�筝�` `筝�筝�` char(1);
-ALTER TABLE `蘊�蘊�蘊�` MODIFY `筝�筝�筝�` char(6);
-
-SELECT * FROM `蘊�蘊�蘊�`;
-DESC `蘊�蘊�蘊�`;
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-
-ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP PRIMARY KEY;
-#ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
-#ALTER TABLE `蘊�蘊�蘊�` DROP FOREIGN KEY `箙�箙�箙�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP `筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP `筝�筝�筝�`;
-ALTER TABLE `蘊�蘊�蘊�` DROP `箙�箙�箙�`;
-
-SELECT * FROM `蘊�蘊�蘊�`;
-DESC `蘊�蘊�蘊�`;
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-
-DROP TABLE `鐔縁襲鐔�`;
-DROP TABLE `鐔駕讐鐔�`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_sjis.test b/mysql-test/suite/jp/t/jp_charlength_sjis.test
index 5f3543bb7a6..91bdb272d14 100644
--- a/mysql-test/suite/jp/t/jp_charlength_sjis.test
+++ b/mysql-test/suite/jp/t/jp_charlength_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P`;
@@ -57,16 +50,11 @@ SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�S`;
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�T`;
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�V`;
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�W`;
 SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`, CHAR_LENGTH(`�b�P`) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -76,6 +64,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_ucs2.test b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
index 2db9db7cfc6..4376ebbd135 100644
--- a/mysql-test/suite/jp/t/jp_charlength_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
@@ -59,16 +51,11 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -78,6 +65,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_ujis.test b/mysql-test/suite/jp/t/jp_charlength_ujis.test
index 08973231f27..3f55e8ee73d 100644
--- a/mysql-test/suite/jp/t/jp_charlength_ujis.test
+++ b/mysql-test/suite/jp/t/jp_charlength_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
@@ -58,16 +50,11 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`;
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -77,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charlength_utf8.test b/mysql-test/suite/jp/t/jp_charlength_utf8.test
index a3f74db27ee..9e88bd98907 100644
--- a/mysql-test/suite/jp/t/jp_charlength_utf8.test
+++ b/mysql-test/suite/jp/t/jp_charlength_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
@@ -56,16 +49,11 @@ SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CHAR_LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -75,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test
index 3a9f264bdfe..4cde0848a95 100644
--- a/mysql-test/suite/jp/t/jp_charset_sjis.test
+++ b/mysql-test/suite/jp/t/jp_charset_sjis.test
@@ -1,3 +1,8 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +14,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +29,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +46,6 @@ CREATE TABLE `�s�P�Q` (`�b�P` char(20)) DEFAULT CHARSET = sjis engine = bdb;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P`;
@@ -85,7 +81,7 @@ SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�U`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�U`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�U`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�V`;
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�W`;
 SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�X`;
@@ -102,23 +98,6 @@ SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�X`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�X`;
 SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�X`;
 
-#BDB
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(`�b�P`) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�O`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�P`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING utf8)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ucs2)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING sjis)) FROM `�s�P�Q`;
-SELECT DISTINCT CHARSET(CONVERT(`�b�P` USING ujis)) FROM `�s�P�Q`;
-
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -128,6 +107,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test
index 5183071033b..8427d721339 100644
--- a/mysql-test/suite/jp/t/jp_charset_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test
@@ -1,4 +1,8 @@
+--source include/have_sjis.inc
 --source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +14,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -27,12 +28,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #Insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -114,31 +112,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
- 
 #InnoDB
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ２`;
@@ -173,7 +146,7 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`;
@@ -190,23 +163,6 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 
-#BDB
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -216,6 +172,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charset_ujis.test b/mysql-test/suite/jp/t/jp_charset_ujis.test
index de9ef318530..6e80162c2fa 100644
--- a/mysql-test/suite/jp/t/jp_charset_ujis.test
+++ b/mysql-test/suite/jp/t/jp_charset_ujis.test
@@ -1,4 +1,8 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
 --source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +14,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +29,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -49,9 +47,6 @@ CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ujis engine = bdb;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 
 #InnoDB
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
@@ -87,7 +82,7 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`;
@@ -104,23 +99,6 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 
-#BDB
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -130,6 +108,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_charset_utf8.test b/mysql-test/suite/jp/t/jp_charset_utf8.test
index 2d73daba42a..e02c035fb33 100644
--- a/mysql-test/suite/jp/t/jp_charset_utf8.test
+++ b/mysql-test/suite/jp/t/jp_charset_utf8.test
@@ -1,3 +1,9 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +14,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +29,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = innodb
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +47,6 @@ CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20)) DEFAULT CHARSET = utf8 engine = bdb
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 
 #InnoDB
 SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��`;
@@ -85,7 +82,7 @@ SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��`;
@@ -102,23 +99,6 @@ SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��`;
 SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��`;
 
-#BDB
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING utf8)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ucs2)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING sjis)) FROM `鐚器��鐚�`;
-SELECT DISTINCT CHARSET(CONVERT(`鐚ｏ��` USING ujis)) FROM `鐚器��鐚�`;
-
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -128,6 +108,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test
index 93fa33029bf..ccbce35b1e0 100644
--- a/mysql-test/suite/jp/t/jp_convert_sjis.test
+++ b/mysql-test/suite/jp/t/jp_convert_sjis.test
@@ -1,3 +1,9 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;
@@ -12,9 +18,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +30,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -48,9 +48,6 @@ CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis en
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P`;
@@ -74,7 +71,7 @@ SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�U`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�U`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�U`;
 
-#Heap
+#MEMORY
 SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�V`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�V`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�V`;
@@ -85,17 +82,6 @@ SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�X`;
 SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�X`;
 SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�O`;
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�P`;
-SELECT `�b�P`, CONVERT(`�b�P` using utf8) FROM `�s�P�Q`;
-SELECT `�b�P`, CONVERT(`�b�P` using ucs2) FROM `�s�P�Q`;
-SELECT `�b�P`, CONVERT(`�b�P` using ujis) FROM `�s�P�Q`;
-
 drop table `�s�P`;
 drop table `�s�Q`;
 drop table `�s�R`;
@@ -105,6 +91,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test
index 88b0d0c9cba..cf79622373c 100644
--- a/mysql-test/suite/jp/t/jp_convert_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test
@@ -1,4 +1,8 @@
+--source include/have_sjis.inc
 --source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +14,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +30,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #Insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -116,31 +114,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-
 #InnoDB
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１`;
@@ -165,7 +138,7 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ６`;
 
-#Heap
+#MEMORY
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ７`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ７`;
@@ -177,18 +150,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
-# The result will get garbled because jisx0212 is not included in sjis
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`;
-
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -198,6 +159,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_convert_ujis.test b/mysql-test/suite/jp/t/jp_convert_ujis.test
index d6303b66f34..f15fee492e5 100644
--- a/mysql-test/suite/jp/t/jp_convert_ujis.test
+++ b/mysql-test/suite/jp/t/jp_convert_ujis.test
@@ -1,4 +1,8 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
 --source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +14,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +29,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -49,9 +47,6 @@ CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis en
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 
 #InnoDB
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
@@ -77,7 +72,7 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ６`;
 
-#Heap
+#MEMORY
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ７`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ７`;
@@ -89,18 +84,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
-# The result will get garbled because jisx0212 is not included in sjis
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`;
-
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -110,6 +93,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test
index a687b0f06cb..7a230495e78 100644
--- a/mysql-test/suite/jp/t/jp_convert_utf8.test
+++ b/mysql-test/suite/jp/t/jp_convert_utf8.test
@@ -1,3 +1,8 @@
+--source include/have_sjis.inc
+--source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +13,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +28,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +46,6 @@ CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET =
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
  LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
- LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 
 #InnoDB
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��`;
@@ -75,7 +71,7 @@ SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��`;
 
-#Heap
+#MEMORY
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��`;
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��`;
@@ -87,18 +83,6 @@ SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��`;
 # The result will get garbled because jisx0212 is not included in sjis
 SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ujis) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using ucs2) FROM `鐚器��鐚�`;
-# The result will get garbled because jisx0212 is not included in sjis
-SELECT `鐚ｏ��`, CONVERT(`鐚ｏ��` using sjis) FROM `鐚器��鐚�`;
-
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -108,6 +92,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test
index ef66d338fce..7d231eaf22c 100644
--- a/mysql-test/suite/jp/t/jp_create_db_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test
@@ -1,3 +1,4 @@
+--source include/have_sjis.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;
diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test
index 4f8eb24cbe3..f8faf411ed0 100644
--- a/mysql-test/suite/jp/t/jp_create_db_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
@@ -1,3 +1,4 @@
+--source include/have_utf8.inc
 --disable_warnings
 drop database if exists `鐓�鐓�鐓�鐔削��`;
 drop database if exists `��ユ��茯�`;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
index 45c0b24388b..3a799958124 100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;
@@ -163,101 +165,29 @@ DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
 DROP TABLE `�\�\�\`;
 
-CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
 # Tables should not be created because table names exist 
-CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
 # Tables should be created
-CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
-
-DESC `臼�`; 
-DESC `臆�`;
-DESC `崖�`;
-DESC `幹�`;
-DESC `亀�`;
-DESC `������`;
-DESC `������`;
-DESC `������`;
-DESC `������`;
-DESC `������`;
-DESC `�\�\�\`;
-DESC `�\�\�\`;
-DESC `�\�\�\`;
-DESC `�\�\�\`;
-DESC `�\�\�\`;
-
-SHOW CREATE TABLE `臼�`;
-SHOW CREATE TABLE `臆�`;
-SHOW CREATE TABLE `崖�`;
-SHOW CREATE TABLE `幹�`;
-SHOW CREATE TABLE `亀�`;
-SHOW CREATE TABLE `������`;
-SHOW CREATE TABLE `������`;
-SHOW CREATE TABLE `������`;
-SHOW CREATE TABLE `������`;
-SHOW CREATE TABLE `������`;
-SHOW CREATE TABLE `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-SHOW CREATE TABLE `�\�\�\`;
-
-DROP TABLE `臼�`;
-DROP TABLE `臆�`;
-DROP TABLE `崖�`;
-DROP TABLE `幹�`;
-DROP TABLE `亀�`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `������`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-DROP TABLE `�\�\�\`;
-
-CREATE TABLE `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-# Tables should not be created because table names exist 
-CREATE TABLE IF NOT EXISTS `臼�`(`橋�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `臆�`(`祁�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-# Tables should be created
-CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+CREATE TABLE IF NOT EXISTS `崖�`(`幻�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `�\�\�\`(`�\�\�\`char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `幹�`(`更�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `亀�`(`査�` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `������`(`������` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TEMPORARY TABLE `�\�\�\`(`�\�\�\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY;
 
 DESC `臼�`; 
 DESC `臆�`;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
index 519697e3530..986cc50b10f 100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
@@ -169,101 +170,29 @@ DROP TABLE `龞龞龞`;
 DROP TABLE `龡龡龡`;
 DROP TABLE `龢龢龢`;
 
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 # Tables should not be created because table names exist
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 # Tables should be created
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
-
-DESC `ｱｱｱ`;
-DESC `ｲｲｲ`;
-DESC `ｳｳｳ`;
-DESC `ｴｴｴ`;
-DESC `ｵｵｵ`;
-DESC `あああ`;
-DESC `いいい`;
-DESC `ううう`;
-DESC `えええ`;
-DESC `おおお`;
-DESC `龖龖龖`;
-DESC `龗龗龗`;
-DESC `龞龞龞`;
-DESC `龡龡龡`;
-DESC `龢龢龢`;
-
-SHOW CREATE TABLE `ｱｱｱ`;
-SHOW CREATE TABLE `ｲｲｲ`;
-SHOW CREATE TABLE `ｳｳｳ`;
-SHOW CREATE TABLE `ｴｴｴ`;
-SHOW CREATE TABLE `ｵｵｵ`;
-SHOW CREATE TABLE `あああ`;
-SHOW CREATE TABLE `いいい`;
-SHOW CREATE TABLE `ううう`;
-SHOW CREATE TABLE `えええ`;
-SHOW CREATE TABLE `おおお`;
-SHOW CREATE TABLE `龖龖龖`;
-SHOW CREATE TABLE `龗龗龗`;
-SHOW CREATE TABLE `龞龞龞`;
-SHOW CREATE TABLE `龡龡龡`;
-SHOW CREATE TABLE `龢龢龢`;
-
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `ｳｳｳ`;
-DROP TABLE `ｴｴｴ`;
-DROP TABLE `ｵｵｵ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `ううう`;
-DROP TABLE `えええ`;
-DROP TABLE `おおお`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-DROP TABLE `龞龞龞`;
-DROP TABLE `龡龡龡`;
-DROP TABLE `龢龢龢`;
-
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-# Tables should not be created because table names exist
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-# Tables should be created
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY;
 
 DESC `ｱｱｱ`;
 DESC `ｲｲｲ`;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
index ac70facdce9..c82d11868bd 100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
@@ -169,101 +170,29 @@ DROP TABLE `龞龞龞`;
 DROP TABLE `龡龡龡`;
 DROP TABLE `龢龢龢`;
 
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
 # Tables should not be created because table names exist
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
 # Tables should be created
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
-
-DESC `ｱｱｱ`;
-DESC `ｲｲｲ`;
-DESC `ｳｳｳ`;
-DESC `ｴｴｴ`;
-DESC `ｵｵｵ`;
-DESC `あああ`;
-DESC `いいい`;
-DESC `ううう`;
-DESC `えええ`;
-DESC `おおお`;
-DESC `龖龖龖`;
-DESC `龗龗龗`;
-DESC `龞龞龞`;
-DESC `龡龡龡`;
-DESC `龢龢龢`;
-
-SHOW CREATE TABLE `ｱｱｱ`;
-SHOW CREATE TABLE `ｲｲｲ`;
-SHOW CREATE TABLE `ｳｳｳ`;
-SHOW CREATE TABLE `ｴｴｴ`;
-SHOW CREATE TABLE `ｵｵｵ`;
-SHOW CREATE TABLE `あああ`;
-SHOW CREATE TABLE `いいい`;
-SHOW CREATE TABLE `ううう`;
-SHOW CREATE TABLE `えええ`;
-SHOW CREATE TABLE `おおお`;
-SHOW CREATE TABLE `龖龖龖`;
-SHOW CREATE TABLE `龗龗龗`;
-SHOW CREATE TABLE `龞龞龞`;
-SHOW CREATE TABLE `龡龡龡`;
-SHOW CREATE TABLE `龢龢龢`;
-
-DROP TABLE `ｱｱｱ`;
-DROP TABLE `ｲｲｲ`;
-DROP TABLE `ｳｳｳ`;
-DROP TABLE `ｴｴｴ`;
-DROP TABLE `ｵｵｵ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `ううう`;
-DROP TABLE `えええ`;
-DROP TABLE `おおお`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-DROP TABLE `龞龞龞`;
-DROP TABLE `龡龡龡`;
-DROP TABLE `龢龢龢`;
-
-CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-# Tables should not be created because table names exist
-CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-# Tables should be created
-CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=BDB;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = ujis engine=MEMORY;
 
 DESC `ｱｱｱ`;
 DESC `ｲｲｲ`;
diff --git a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
index 5c816eb169a..d079560a931 100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 DROP TABLE IF EXISTS `鐔縁襲鐔�`;
 DROP TABLE IF EXISTS `鐔駕讐鐔�`;
@@ -167,101 +169,29 @@ DROP TABLE `蘊�蘊�蘊�`;
 DROP TABLE `蘊♂勝蘊�`;
 DROP TABLE `蘊∫匠蘊�`;
 
-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 `���������`(`���������` 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 `鐔縁襲鐔�`(`鐔駈酋鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `鐔駕讐鐔�`(`鐔件酬鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
 # Tables should not be created because table names exist
-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;
-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;
+CREATE TABLE IF NOT EXISTS `鐔縁襲鐔�`(`鐔駈酋鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `鐔駕讐鐔�`(`鐔件酬鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
 # Tables should be created
-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;
-CREATE TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-
-DESC `鐔縁襲鐔�`;
-DESC `鐔駕讐鐔�`;
-DESC `鐔鰹蹴鐔�`;
-DESC `鐔器輯鐔�`;
-DESC `鐔居週鐔�`;
-DESC `���������`;
-DESC `���������`;
-DESC `���������`;
-DESC `���������`;
-DESC `���������`;
-DESC `蘊�蘊�蘊�`;
-DESC `蘊�蘊�蘊�`;
-DESC `蘊�蘊�蘊�`;
-DESC `蘊♂勝蘊�`;
-DESC `蘊∫匠蘊�`;
-
-SHOW CREATE TABLE `鐔縁襲鐔�`;
-SHOW CREATE TABLE `鐔駕讐鐔�`;
-SHOW CREATE TABLE `鐔鰹蹴鐔�`;
-SHOW CREATE TABLE `鐔器輯鐔�`;
-SHOW CREATE TABLE `鐔居週鐔�`;
-SHOW CREATE TABLE `���������`;
-SHOW CREATE TABLE `���������`;
-SHOW CREATE TABLE `���������`;
-SHOW CREATE TABLE `���������`;
-SHOW CREATE TABLE `���������`;
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-SHOW CREATE TABLE `蘊�蘊�蘊�`;
-SHOW CREATE TABLE `蘊♂勝蘊�`;
-SHOW CREATE TABLE `蘊∫匠蘊�`;
-
-DROP TABLE `鐔縁襲鐔�`;
-DROP TABLE `鐔駕讐鐔�`;
-DROP TABLE `鐔鰹蹴鐔�`;
-DROP TABLE `鐔器輯鐔�`;
-DROP TABLE `鐔居週鐔�`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `���������`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊�蘊�蘊�`;
-DROP TABLE `蘊♂勝蘊�`;
-DROP TABLE `蘊∫匠蘊�`;
-
-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 `���������`(`���������` 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;
-# Tables should not be created because table names exist
-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;
-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;
-# Tables should be created
-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;
-CREATE TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+CREATE TABLE IF NOT EXISTS `鐔鰹蹴鐔�`(`鐔醐集鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `蘊�蘊�蘊�`(`筝�筝�筝�`char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `鐔器輯鐔�`(`鐔刻醜鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `鐔居週鐔�`(`鐔削什鐔�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `���������`(`���������` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `蘊♂勝蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `蘊∫匠蘊�`(`筝�筝�筝�` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
 
 DESC `鐔縁襲鐔�`;
 DESC `鐔駕讐鐔�`;
diff --git a/mysql-test/suite/jp/t/jp_enum_sjis-master.opt b/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
new file mode 100644
index 00000000000..9b27aef9bf8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
@@ -0,0 +1 @@
+--lower_case_table_names=0
diff --git a/mysql-test/suite/jp/t/jp_enum_sjis.test b/mysql-test/suite/jp/t/jp_enum_sjis.test
index 2ea1bf320e0..e1f22f6fe27 100644
--- a/mysql-test/suite/jp/t/jp_enum_sjis.test
+++ b/mysql-test/suite/jp/t/jp_enum_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,10 +11,7 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
-#drop table if exists t1;
+drop table if exists t1;
 --enable_warnings
 
 #
@@ -28,12 +27,9 @@ CREATE TABLE `�s�R` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET
 CREATE TABLE `�s�S` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` ENUM('�','�','�'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` ENUM('��','��','��'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` ENUM('�\','�\','�\'), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�Q` VALUES ('��'),('��'),('��');
@@ -44,9 +40,6 @@ INSERT INTO `�s�U` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�V` VALUES ('�'),('�'),('�');
 INSERT INTO `�s�W` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�X` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�O` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�P` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Q` VALUES ('�\'),('�\'),('�\');
 
 SELECT * FROM `�s�P`;
 SELECT * FROM `�s�Q`;
@@ -57,9 +50,6 @@ SELECT * FROM `�s�U`;
 SELECT * FROM `�s�V`;
 SELECT * FROM `�s�W`;
 SELECT * FROM `�s�X`;
-SELECT * FROM `�s�P�O`;
-SELECT * FROM `�s�P�P`;
-SELECT * FROM `�s�P�Q`;
 
 SHOW CREATE TABLE `�s�P`;
 SHOW CREATE TABLE `�s�Q`;
@@ -70,9 +60,6 @@ SHOW CREATE TABLE `�s�U`;
 SHOW CREATE TABLE `�s�V`;
 SHOW CREATE TABLE `�s�W`;
 SHOW CREATE TABLE `�s�X`;
-SHOW CREATE TABLE `�s�P�O`;
-SHOW CREATE TABLE `�s�P�P`;
-SHOW CREATE TABLE `�s�P�Q`;
 
 DESC `�s�P`;
 DESC `�s�Q`;
@@ -83,9 +70,6 @@ DESC `�s�U`;
 DESC `�s�V`;
 DESC `�s�W`;
 DESC `�s�X`;
-DESC `�s�P�O`;
-DESC `�s�P�P`;
-DESC `�s�P�Q`;
 
 #
 # Test problem with enum values after the colum with  NOT NULL restriction
@@ -100,9 +84,6 @@ ALTER TABLE `�s�U` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�V` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�W` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `�s�X` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�O` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�P` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `�s�P�Q` ADD `�b�Q` CHAR(1) NOT NULL FIRST;
 
 SHOW CREATE TABLE `�s�P`;
 SHOW CREATE TABLE `�s�Q`;
@@ -113,18 +94,16 @@ SHOW CREATE TABLE `�s�U`;
 SHOW CREATE TABLE `�s�V`;
 SHOW CREATE TABLE `�s�W`;
 SHOW CREATE TABLE `�s�X`;
-SHOW CREATE TABLE `�s�P�O`;
-SHOW CREATE TABLE `�s�P�P`;
-SHOW CREATE TABLE `�s�P�Q`;
 
 #
 # Test to distinguish 0x9353 and 0x9373
-# bug #6206 need to be fixed
+# Bug#6206 ENUMs are not case sensitive even if declared BINARY
+#
 
-#CREATE TABLE t1(c1 enum('�S','�s')) default character set = sjis;
-#INSERT INTO t1 VALUES('�S'),('�s');
-#SELECT * FROM t1 WHERE c1 LIKE '�S';
-#DROP TABLE t1;
+CREATE TABLE t1(c1 enum('�S','�s')) default character set = sjis;
+INSERT INTO t1 VALUES('�S'),('�s');
+SELECT * FROM t1 WHERE c1 LIKE '�S';
+DROP TABLE t1;
 
 DESC `�s�P`;
 DESC `�s�Q`;
@@ -135,9 +114,6 @@ DESC `�s�U`;
 DESC `�s�V`;
 DESC `�s�W`;
 DESC `�s�X`;
-DESC `�s�P�O`;
-DESC `�s�P�P`;
-DESC `�s�P�Q`;
 
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
@@ -148,6 +124,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt b/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
new file mode 100644
index 00000000000..9b27aef9bf8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
@@ -0,0 +1 @@
+--lower_case_table_names=0
diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2.test b/mysql-test/suite/jp/t/jp_enum_ucs2.test
index 2239ebab478..a3d7c47705d 100644
--- a/mysql-test/suite/jp/t/jp_enum_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 # half-with kana is not handled correctly in 4.1
 # because of bug #5174
@@ -14,9 +15,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -33,12 +31,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHAR
 CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
@@ -49,9 +44,6 @@ INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
-INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
-INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
 
 SELECT * FROM `Ｔ１`;
 SELECT * FROM `Ｔ２`;
@@ -62,9 +54,6 @@ SELECT * FROM `Ｔ６`;
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
 
 SHOW CREATE TABLE `Ｔ１`;
 SHOW CREATE TABLE `Ｔ２`;
@@ -75,9 +64,6 @@ SHOW CREATE TABLE `Ｔ６`;
 SHOW CREATE TABLE `Ｔ７`;
 SHOW CREATE TABLE `Ｔ８`;
 SHOW CREATE TABLE `Ｔ９`;
-SHOW CREATE TABLE `Ｔ１０`;
-SHOW CREATE TABLE `Ｔ１１`;
-SHOW CREATE TABLE `Ｔ１２`;
 
 DESC `Ｔ１`;
 DESC `Ｔ２`;
@@ -88,52 +74,39 @@ DESC `Ｔ６`;
 DESC `Ｔ７`;
 DESC `Ｔ８`;
 DESC `Ｔ９`;
-DESC `Ｔ１０`;
-DESC `Ｔ１１`;
-DESC `Ｔ１２`;
 
 #
 # Test problem with enum values after the colum with  NOT NULL restriction
-# Cannot test until the bug#7302 is fixed
+# Bug#7302 UCS2 data in ENUM field get truncated when new column is added
+ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ４` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ５` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 
-#ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ４` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ５` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-#ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-
-#SHOW CREATE TABLE `Ｔ１`;
-#SHOW CREATE TABLE `Ｔ２`;
-#SHOW CREATE TABLE `Ｔ３`;
-#SHOW CREATE TABLE `Ｔ４`;
-#SHOW CREATE TABLE `Ｔ５`;
-#SHOW CREATE TABLE `Ｔ６`;
-#SHOW CREATE TABLE `Ｔ７`;
-#SHOW CREATE TABLE `Ｔ８`;
-#SHOW CREATE TABLE `Ｔ９`;
-#SHOW CREATE TABLE `Ｔ１０`;
-#SHOW CREATE TABLE `Ｔ１１`;
-#SHOW CREATE TABLE `Ｔ１２`;
+SHOW CREATE TABLE `Ｔ１`;
+SHOW CREATE TABLE `Ｔ２`;
+SHOW CREATE TABLE `Ｔ３`;
+SHOW CREATE TABLE `Ｔ４`;
+SHOW CREATE TABLE `Ｔ５`;
+SHOW CREATE TABLE `Ｔ６`;
+SHOW CREATE TABLE `Ｔ７`;
+SHOW CREATE TABLE `Ｔ８`;
+SHOW CREATE TABLE `Ｔ９`;
 
-#DESC `Ｔ１`;
-#DESC `Ｔ２`;
-#DESC `Ｔ３`;
-#DESC `Ｔ４`;
-#DESC `Ｔ５`;
-#DESC `Ｔ６`;
-#DESC `Ｔ７`;
-#DESC `Ｔ８`;
-#DESC `Ｔ９`;
-#DESC `Ｔ１０`;
-#DESC `Ｔ１１`;
-#DESC `Ｔ１２`;
+DESC `Ｔ１`;
+DESC `Ｔ２`;
+DESC `Ｔ３`;
+DESC `Ｔ４`;
+DESC `Ｔ５`;
+DESC `Ｔ６`;
+DESC `Ｔ７`;
+DESC `Ｔ８`;
+DESC `Ｔ９`;
 
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
@@ -144,6 +117,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_enum_ujis-master.opt b/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
new file mode 100644
index 00000000000..9b27aef9bf8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
@@ -0,0 +1 @@
+--lower_case_table_names=0
diff --git a/mysql-test/suite/jp/t/jp_enum_ujis.test b/mysql-test/suite/jp/t/jp_enum_ujis.test
index da41165aad0..17e41e0691e 100644
--- a/mysql-test/suite/jp/t/jp_enum_ujis.test
+++ b/mysql-test/suite/jp/t/jp_enum_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHAR
 CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
 INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
 INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
-INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
-INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
 
 SELECT * FROM `Ｔ１`;
 SELECT * FROM `Ｔ２`;
@@ -57,9 +49,6 @@ SELECT * FROM `Ｔ６`;
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
 
 SHOW CREATE TABLE `Ｔ１`;
 SHOW CREATE TABLE `Ｔ２`;
@@ -70,9 +59,6 @@ SHOW CREATE TABLE `Ｔ６`;
 SHOW CREATE TABLE `Ｔ７`;
 SHOW CREATE TABLE `Ｔ８`;
 SHOW CREATE TABLE `Ｔ９`;
-SHOW CREATE TABLE `Ｔ１０`;
-SHOW CREATE TABLE `Ｔ１１`;
-SHOW CREATE TABLE `Ｔ１２`;
 
 DESC `Ｔ１`;
 DESC `Ｔ２`;
@@ -83,9 +69,6 @@ DESC `Ｔ６`;
 DESC `Ｔ７`;
 DESC `Ｔ８`;
 DESC `Ｔ９`;
-DESC `Ｔ１０`;
-DESC `Ｔ１１`;
-DESC `Ｔ１２`;
 
 #
 # Test problem with enum values after the colum with  NOT NULL restriction
@@ -100,9 +83,6 @@ ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 
 SHOW CREATE TABLE `Ｔ１`;
 SHOW CREATE TABLE `Ｔ２`;
@@ -113,9 +93,6 @@ SHOW CREATE TABLE `Ｔ６`;
 SHOW CREATE TABLE `Ｔ７`;
 SHOW CREATE TABLE `Ｔ８`;
 SHOW CREATE TABLE `Ｔ９`;
-SHOW CREATE TABLE `Ｔ１０`;
-SHOW CREATE TABLE `Ｔ１１`;
-SHOW CREATE TABLE `Ｔ１２`;
 
 DESC `Ｔ１`;
 DESC `Ｔ２`;
@@ -126,9 +103,6 @@ DESC `Ｔ６`;
 DESC `Ｔ７`;
 DESC `Ｔ８`;
 DESC `Ｔ９`;
-DESC `Ｔ１０`;
-DESC `Ｔ１１`;
-DESC `Ｔ１２`;
 
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
@@ -139,6 +113,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_enum_utf8-master.opt b/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
new file mode 100644
index 00000000000..9b27aef9bf8
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
@@ -0,0 +1 @@
+--lower_case_table_names=0
diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test
index 4ce3576b604..ff5978da69c 100644
--- a/mysql-test/suite/jp/t/jp_enum_utf8.test
+++ b/mysql-test/suite/jp/t/jp_enum_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAUL
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('鐔�','鐔�','鐔�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('���','���','���'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` ENUM('蘊�','蘊�','蘊�'), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��` VALUES ('���'),('���'),('���');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔�'),('鐔�'),('鐔�');
 INSERT INTO `鐚器��` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�'),('蘊�'),('蘊�');
 
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
@@ -55,9 +48,6 @@ SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
 
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
@@ -68,9 +58,6 @@ SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
-SHOW CREATE TABLE `鐚器��鐚�`;
-SHOW CREATE TABLE `鐚器��鐚�`;
-SHOW CREATE TABLE `鐚器��鐚�`;
 
 DESC `鐚器��`;
 DESC `鐚器��`;
@@ -81,9 +68,6 @@ DESC `鐚器��`;
 DESC `鐚器��`;
 DESC `鐚器��`;
 DESC `鐚器��`;
-DESC `鐚器��鐚�`;
-DESC `鐚器��鐚�`;
-DESC `鐚器��鐚�`;
 
 #
 # Test problem with enum values after the colum with  NOT NULL restriction
@@ -98,9 +82,6 @@ ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `鐚器��` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `鐚器��鐚�` ADD `鐚ｏ��` CHAR(1) NOT NULL FIRST;
 
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
@@ -111,9 +92,6 @@ SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
 SHOW CREATE TABLE `鐚器��`;
-SHOW CREATE TABLE `鐚器��鐚�`;
-SHOW CREATE TABLE `鐚器��鐚�`;
-SHOW CREATE TABLE `鐚器��鐚�`;
 
 DESC `鐚器��`;
 DESC `鐚器��`;
@@ -124,9 +102,6 @@ DESC `鐚器��`;
 DESC `鐚器��`;
 DESC `鐚器��`;
 DESC `鐚器��`;
-DESC `鐚器��鐚�`;
-DESC `鐚器��鐚�`;
-DESC `鐚器��鐚�`;
 
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -137,6 +112,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_insert_sjis.test b/mysql-test/suite/jp/t/jp_insert_sjis.test
index 0266ad1eaca..957798cb042 100644
--- a/mysql-test/suite/jp/t/jp_insert_sjis.test
+++ b/mysql-test/suite/jp/t/jp_insert_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 #InnoDB
 SELECT INSERT(`�b�P`,1,1,'�') FROM `�s�P`;
@@ -201,7 +194,7 @@ SELECT INSERT(`�b�P`,4,1,'�\') FROM `�s�U`;
 SELECT INSERT(`�b�P`,4,2,'�\�\' ) FROM `�s�U`;
 SELECT INSERT(`�b�P`,5,1,'�\') FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT INSERT(`�b�P`,1,1,'�') FROM `�s�V`;
 SELECT INSERT(`�b�P`,1,2,'況') FROM `�s�V`;
 SELECT INSERT(`�b�P`,1,3,'況�') FROM `�s�V`;
@@ -278,68 +271,6 @@ SELECT INSERT(`�b�P`,4,1,'�\') FROM `�s�X`;
 SELECT INSERT(`�b�P`,4,2,'�\�\' ) FROM `�s�X`;
 SELECT INSERT(`�b�P`,5,1,'�\') FROM `�s�X`;
 
-#BDB
-SELECT INSERT(`�b�P`,1,1,'�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,1,2,'況') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,1,3,'況�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,1,4,'況弦') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,1,5,'況弦�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,2,1,'�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,2,2,'係') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,2,3,'係�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,2,4,'係杭') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,3,1,'�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,3,2,'弦') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,3,3,'弦�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,4,1,'�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,4,2,'杭') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,5,1,'�') FROM `�s�P�O`;
-SELECT INSERT(`�b�P`,1,1,'��') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,2,'����') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,3,'������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,4,'��������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,5,'����������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,1,'��') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,2,'����') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,3,'������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,4,'��������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,1,'��') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,2,'����') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,3,'������') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,4,1,'��') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,4,2,'����') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,5,1,'��') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,1,'�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,2,'�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,3,'�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,4,'�@�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,5,'�@�@�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,1,'�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,2,'�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,3,'�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,2,4,'�@�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,1,'�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,2,'�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,3,3,'�@�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,4,1,'�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,4,2,'�@�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,5,1,'�@') FROM `�s�P�P`;
-SELECT INSERT(`�b�P`,1,1,'�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,1,2,'�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,1,3,'�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,1,4,'�\�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,1,5,'�\�\�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,2,1,'�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,2,2,'�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,2,3,'�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,2,4,'�\�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,3,1,'�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,3,2,'�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,3,3,'�\�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,4,1,'�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,4,2,'�\�\') FROM `�s�P�Q`;
-SELECT INSERT(`�b�P`,5,1,'�\') FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -349,6 +280,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_insert_ucs2.test b/mysql-test/suite/jp/t/jp_insert_ucs2.test
index 9b0a02e57d8..0cf29ed3104 100644
--- a/mysql-test/suite/jp/t/jp_insert_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_insert_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
@@ -203,7 +195,7 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ６`;
 SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ６`;
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ７`;
 SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ７`;
 SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ７`;
@@ -280,68 +272,6 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ９`;
 SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ９`;
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`;
 
-#BDB
-SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -351,6 +281,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_insert_ujis.test b/mysql-test/suite/jp/t/jp_insert_ujis.test
index 7b6d2838386..ba046df774d 100644
--- a/mysql-test/suite/jp/t/jp_insert_ujis.test
+++ b/mysql-test/suite/jp/t/jp_insert_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
@@ -203,7 +195,7 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ６`;
 SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ６`;
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ７`;
 SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ７`;
 SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ７`;
@@ -280,68 +272,6 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ９`;
 SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ９`;
 SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`;
 
-#BDB
-SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`;
-SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,4,'　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,5,'　　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,2,4,'　　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,3,3,'　　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,4,2,'　　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,5,1,'　') FROM `Ｔ１１`;
-SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`;
-SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -351,6 +281,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_insert_utf8.test b/mysql-test/suite/jp/t/jp_insert_utf8.test
index ef6acb90063..464f3bca634 100644
--- a/mysql-test/suite/jp/t/jp_insert_utf8.test
+++ b/mysql-test/suite/jp/t/jp_insert_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT INSERT(`鐚ｏ��`,1,1,'鐔�') FROM `鐚器��`;
@@ -200,7 +193,7 @@ SELECT INSERT(`鐚ｏ��`,4,1,'筝�') FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,4,2,'筝�筝�' ) FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,5,1,'筝�') FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT INSERT(`鐚ｏ��`,1,1,'鐔�') FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,1,2,'鐔駈酋') FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,1,3,'鐔駈酋鐔�') FROM `鐚器��`;
@@ -277,68 +270,6 @@ SELECT INSERT(`鐚ｏ��`,4,1,'筝�') FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,4,2,'筝�筝�' ) FROM `鐚器��`;
 SELECT INSERT(`鐚ｏ��`,5,1,'筝�') FROM `鐚器��`;
 
-#BDB
-SELECT INSERT(`鐚ｏ��`,1,1,'鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,2,'鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,4,'鐔駈酋鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,5,'鐔駈酋鐔駈酋鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,1,'鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,2,'鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,4,'鐔駈酋鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,1,'鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,2,'鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,3,'鐔駈酋鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,1,'鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,2,'鐔駈酋') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,5,1,'鐔�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,4,'������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,5,'���������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,4,'������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,5,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,4,'������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,5,'���������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,4,'������������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,3,'���������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,2,'������') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,5,1,'���') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,1,'筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,2,'筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,4,'筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,1,5,'筝�筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,1,'筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,2,'筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,2,4,'筝�筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,1,'筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,2,'筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,3,3,'筝�筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,1,'筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,4,2,'筝�筝�') FROM `鐚器��鐚�`;
-SELECT INSERT(`鐚ｏ��`,5,1,'筝�') FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -348,6 +279,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_instr_sjis.test b/mysql-test/suite/jp/t/jp_instr_sjis.test
index c19b5f2b14c..626429f271b 100644
--- a/mysql-test/suite/jp/t/jp_instr_sjis.test
+++ b/mysql-test/suite/jp/t/jp_instr_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,7 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 --enable_warnings
 
 #
@@ -25,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -41,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 #InnoDB
 SELECT INSTR(`�b�P`,'�') from `�s�P`;
@@ -85,7 +80,7 @@ SELECT INSTR(`�b�P`,'�\') from `�s�U`;
 SELECT INSTR(`�b�P`,'�\') from `�s�U`;
 SELECT INSTR(`�b�P`,'�\') from `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT INSTR(`�b�P`,'�') from `�s�V`;
 SELECT INSTR(`�b�P`,'�') from `�s�V`;
 SELECT INSTR(`�b�P`,'�') from `�s�V`;
@@ -105,26 +100,6 @@ SELECT INSTR(`�b�P`,'�\') from `�s�X`;
 SELECT INSTR(`�b�P`,'�\') from `�s�X`;
 SELECT INSTR(`�b�P`,'�\') from `�s�X`;
 
-#BDB
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'�') from `�s�P�O`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'��') from `�s�P�P`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-SELECT INSTR(`�b�P`,'�\') from `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -134,6 +109,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test
index b8f83961e90..a074e31569f 100644
--- a/mysql-test/suite/jp/t/jp_instr_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_instr_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -43,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
@@ -87,7 +81,7 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`;
@@ -107,26 +101,6 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
 
-#BDB
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -136,6 +110,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_instr_ujis.test b/mysql-test/suite/jp/t/jp_instr_ujis.test
index 696e1147372..b2dd233557b 100644
--- a/mysql-test/suite/jp/t/jp_instr_ujis.test
+++ b/mysql-test/suite/jp/t/jp_instr_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -42,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
@@ -86,7 +80,7 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`;
@@ -106,26 +100,6 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
 
-#BDB
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -135,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test
index b25b72bc8d0..27c2cb24e6d 100644
--- a/mysql-test/suite/jp/t/jp_instr_utf8.test
+++ b/mysql-test/suite/jp/t/jp_instr_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,7 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -40,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��`;
@@ -84,7 +79,7 @@ SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'筝�') from `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��`;
@@ -104,26 +99,6 @@ SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��`;
 SELECT INSTR(`鐚ｏ��`,'筝�') from `鐚器��`;
 
-#BDB
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'鐔�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'鐓�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'���') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'蘊�') from `鐚器��鐚�`;
-SELECT INSTR(`鐚ｏ��`,'筝�') from `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -133,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test
index 30b23913929..031b6bc8c89 100644
--- a/mysql-test/suite/jp/t/jp_join_sjis.test
+++ b/mysql-test/suite/jp/t/jp_join_sjis.test
@@ -1,17 +1,25 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
-drop table if exists `�s�P`;
-drop table if exists `�s�Q`;
-drop table if exists `�s�R`;
-drop table if exists `�s�S`;
-drop table if exists `�s�T`;
-drop table if exists `�s�U`;
-drop table if exists `�s�V`;
-drop table if exists `�s�W`;
-drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
+DROP TABLE IF EXISTS `�s�Pa`;
+DROP TABLE IF EXISTS `�s�Pb`;
+DROP TABLE IF EXISTS `�s�Qa`;
+DROP TABLE IF EXISTS `�s�Qb`;
+DROP TABLE IF EXISTS `�s�Ra`;
+DROP TABLE IF EXISTS `�s�Rb`;
+DROP TABLE IF EXISTS `�s�Sa`;
+DROP TABLE IF EXISTS `�s�Sb`;
+DROP TABLE IF EXISTS `�s�Ta`;
+DROP TABLE IF EXISTS `�s�Tb`;
+DROP TABLE IF EXISTS `�s�Ua`;
+DROP TABLE IF EXISTS `�s�Ub`;
+DROP TABLE IF EXISTS `�s�Va`;
+DROP TABLE IF EXISTS `�s�Vb`;
+DROP TABLE IF EXISTS `�s�Wa`;
+DROP TABLE IF EXISTS `�s�Wb`;
+DROP TABLE IF EXISTS `�s�Xa`;
+DROP TABLE IF EXISTS `�s�Xb`;
 --enable_warnings
 
 #
@@ -33,18 +41,12 @@ CREATE TABLE `�s�Ta` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine
 CREATE TABLE `�s�Tb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ua` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ub` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Oa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Ob` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -69,12 +71,6 @@ INSERT INTO `�s�Wa` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�Wb` VALUES ('��');
 INSERT INTO `�s�Xa` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�Xb` VALUES ('�\');
-INSERT INTO `�s�P�Oa` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�Ob` VALUES ('�');
-INSERT INTO `�s�P�Pa` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Pb` VALUES ('��');
-INSERT INTO `�s�P�Qa` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�Qb` VALUES ('�\');
 
 #Test for innodb
 SELECT * FROM `�s�Pa` JOIN `�s�Pb`;
@@ -134,7 +130,7 @@ SELECT * FROM `�s�Ua` LEFT JOIN `�s�Ub` ON (`�s�Ua`.`�b�P` = `�s�Ub`.`�b�P`);
 SELECT * FROM `�s�Ub` RIGHT JOIN `�s�Ua` USING (`�b�P`);
 SELECT * FROM `�s�Ub` RIGHT JOIN `�s�Ua` ON (`�s�Ua`.`�b�P` = `�s�Ub`.`�b�P`);
 
-#Test for heap
+#Test for MEMORY
 SELECT * FROM `�s�Va` JOIN `�s�Vb`;
 SELECT * FROM `�s�Va` INNER JOIN `�s�Vb`;
 SELECT * FROM `�s�Va` JOIN `�s�Vb` USING (`�b�P`);
@@ -163,35 +159,6 @@ SELECT * FROM `�s�Xa` LEFT JOIN `�s�Xb` ON (`�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
 SELECT * FROM `�s�Xb` RIGHT JOIN `�s�Xa` USING (`�b�P`);
 SELECT * FROM `�s�Xb` RIGHT JOIN `�s�Xa` ON (`�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
 
-#Test for heap
-SELECT * FROM `�s�P�Oa` JOIN `�s�P�Ob`;
-SELECT * FROM `�s�P�Oa` INNER JOIN `�s�P�Ob`;
-SELECT * FROM `�s�P�Oa` JOIN `�s�P�Ob` USING (`�b�P`);
-SELECT * FROM `�s�P�Oa` INNER JOIN `�s�P�Ob` USING (`�b�P`);
-SELECT * FROM `�s�P�Oa` CROSS JOIN `�s�P�Ob`;
-SELECT * FROM `�s�P�Oa` LEFT JOIN `�s�P�Ob` USING (`�b�P`);
-SELECT * FROM `�s�P�Oa` LEFT JOIN `�s�P�Ob` ON (`�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-SELECT * FROM `�s�P�Ob` RIGHT JOIN `�s�P�Oa` USING (`�b�P`);
-SELECT * FROM `�s�P�Ob` RIGHT JOIN `�s�P�Oa` ON (`�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-SELECT * FROM `�s�P�Pa` JOIN `�s�P�Pb`;
-SELECT * FROM `�s�P�Pa` INNER JOIN `�s�P�Pb`;
-SELECT * FROM `�s�P�Pa` JOIN `�s�P�Pb` USING (`�b�P`);
-SELECT * FROM `�s�P�Pa` INNER JOIN `�s�P�Pb` USING (`�b�P`);
-SELECT * FROM `�s�P�Pa` CROSS JOIN `�s�P�Pb`;
-SELECT * FROM `�s�P�Pa` LEFT JOIN `�s�P�Pb` USING (`�b�P`);
-SELECT * FROM `�s�P�Pa` LEFT JOIN `�s�P�Pb` ON (`�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-SELECT * FROM `�s�P�Pb` RIGHT JOIN `�s�P�Pa` USING (`�b�P`);
-SELECT * FROM `�s�P�Pb` RIGHT JOIN `�s�P�Pa` ON (`�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-SELECT * FROM `�s�P�Qa` JOIN `�s�P�Qb`;
-SELECT * FROM `�s�P�Qa` INNER JOIN `�s�P�Qb`;
-SELECT * FROM `�s�P�Qa` JOIN `�s�P�Qb` USING (`�b�P`);
-SELECT * FROM `�s�P�Qa` INNER JOIN `�s�P�Qb` USING (`�b�P`);
-SELECT * FROM `�s�P�Qa` CROSS JOIN `�s�P�Qb`;
-SELECT * FROM `�s�P�Qa` LEFT JOIN `�s�P�Qb` USING (`�b�P`);
-SELECT * FROM `�s�P�Qa` LEFT JOIN `�s�P�Qb` ON (`�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-SELECT * FROM `�s�P�Qb` RIGHT JOIN `�s�P�Qa` USING (`�b�P`);
-SELECT * FROM `�s�P�Qb` RIGHT JOIN `�s�P�Qa` ON (`�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-
 DROP TABLE `�s�Pa`;
 DROP TABLE `�s�Pb`;
 DROP TABLE `�s�Qa`;
@@ -210,9 +177,3 @@ DROP TABLE `�s�Wa`;
 DROP TABLE `�s�Wb`;
 DROP TABLE `�s�Xa`;
 DROP TABLE `�s�Xb`;
-DROP TABLE `�s�P�Oa`;
-DROP TABLE `�s�P�Ob`;
-DROP TABLE `�s�P�Pa`;
-DROP TABLE `�s�P�Pb`;
-DROP TABLE `�s�P�Qa`;
-DROP TABLE `�s�P�Qb`;
diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test
index 27e49203dd2..2c3a9c241a2 100644
--- a/mysql-test/suite/jp/t/jp_join_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_join_ucs2.test
@@ -1,18 +1,25 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 --enable_warnings
 
 #
@@ -29,24 +36,18 @@ CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine
 CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -71,12 +72,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 
 #Test for innodb
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
@@ -136,7 +131,7 @@ SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 
-#Test for heap
+#Test for MEMORY
 SELECT * FROM `Ｔ７a` JOIN `Ｔ７b`;
 SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`;
 SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`);
@@ -165,35 +160,6 @@ SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 
-#Test for heap
-SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -212,9 +178,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/t/jp_join_ujis.test b/mysql-test/suite/jp/t/jp_join_ujis.test
index 079f260cc26..973c46695c3 100644
--- a/mysql-test/suite/jp/t/jp_join_ujis.test
+++ b/mysql-test/suite/jp/t/jp_join_ujis.test
@@ -1,18 +1,25 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 --enable_warnings
 
 #
@@ -28,24 +35,18 @@ CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine
 CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -70,12 +71,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 
 #Test for innodb
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
@@ -135,7 +130,7 @@ SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`);
 
-#Test for heap
+#Test for MEMORY
 SELECT * FROM `Ｔ７a` JOIN `Ｔ７b`;
 SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`;
 SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`);
@@ -164,35 +159,6 @@ SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 
-#Test for heap
-SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`;
-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 (`Ｃ１`);
-SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`);
-SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
 DROP TABLE `Ｔ２a`;
@@ -211,9 +177,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
diff --git a/mysql-test/suite/jp/t/jp_join_utf8.test b/mysql-test/suite/jp/t/jp_join_utf8.test
index 0b2f033f8bb..d4e25691866 100644
--- a/mysql-test/suite/jp/t/jp_join_utf8.test
+++ b/mysql-test/suite/jp/t/jp_join_utf8.test
@@ -1,16 +1,24 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
+drop table if exists `鐚器��a`;
+drop table if exists `鐚器��b`;
 --enable_warnings
 
 #
@@ -20,30 +28,24 @@ drop table if exists `鐚器��鐚�`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -68,14 +70,8 @@ INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��b` VALUES ('���');
 INSERT INTO `鐚器��a` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��b` VALUES ('蘊�');
-INSERT INTO `鐚器��鐚�a` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�b` VALUES ('鐔�');
-INSERT INTO `鐚器��鐚�a` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�b` VALUES ('���');
-INSERT INTO `鐚器��鐚�a` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�b` VALUES ('蘊�');
 
-#Test for innodb
+#Test for InnoDB
 SELECT * FROM `鐚器��a` JOIN `鐚器��b`;
 SELECT * FROM `鐚器��a` INNER JOIN `鐚器��b`;
 SELECT * FROM `鐚器��a` JOIN `鐚器��b` USING (`鐚ｏ��`);
@@ -133,7 +129,7 @@ SELECT * FROM `鐚器��a` LEFT JOIN `鐚器��b` ON (`鐚器��a`.`鐚ｏ��` = `鐚器��b`.`
 SELECT * FROM `鐚器��b` RIGHT JOIN `鐚器��a` USING (`鐚ｏ��`);
 SELECT * FROM `鐚器��b` RIGHT JOIN `鐚器��a` ON (`鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 
-#Test for heap
+#Test for MEMORY
 SELECT * FROM `鐚器��a` JOIN `鐚器��b`;
 SELECT * FROM `鐚器��a` INNER JOIN `鐚器��b`;
 SELECT * FROM `鐚器��a` JOIN `鐚器��b` USING (`鐚ｏ��`);
@@ -162,35 +158,6 @@ SELECT * FROM `鐚器��a` LEFT JOIN `鐚器��b` ON (`鐚器��a`.`鐚ｏ��` = `鐚器��b`.`
 SELECT * FROM `鐚器��b` RIGHT JOIN `鐚器��a` USING (`鐚ｏ��`);
 SELECT * FROM `鐚器��b` RIGHT JOIN `鐚器��a` ON (`鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 
-#Test for heap
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-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 (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�a` LEFT JOIN `鐚器��鐚�b` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` USING (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-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 (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�a` LEFT JOIN `鐚器��鐚�b` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` USING (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�a` JOIN `鐚器��鐚�b`;
-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 (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�a` LEFT JOIN `鐚器��鐚�b` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` USING (`鐚ｏ��`);
-SELECT * FROM `鐚器��鐚�b` RIGHT JOIN `鐚器��鐚�a` ON (`鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
@@ -209,9 +176,3 @@ DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
diff --git a/mysql-test/suite/jp/t/jp_left_sjis.test b/mysql-test/suite/jp/t/jp_left_sjis.test
index 5d69d9892e2..0d718ccc3a0 100644
--- a/mysql-test/suite/jp/t/jp_left_sjis.test
+++ b/mysql-test/suite/jp/t/jp_left_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P`;
@@ -87,7 +80,7 @@ SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�U`;
 SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�U`;
 SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�V`;
 SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�V`;
 SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�V`;
@@ -107,26 +100,6 @@ SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�X`;
 SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�X`;
 SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�O`;
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�P`;
-SELECT `�b�P`, LEFT(`�b�P`,0) FROM `�s�P�Q`;
-SELECT `�b�P`, LEFT(`�b�P`,1) FROM `�s�P�Q`;
-SELECT `�b�P`, LEFT(`�b�P`,2) FROM `�s�P�Q`;
-SELECT `�b�P`, LEFT(`�b�P`,3) FROM `�s�P�Q`;
-SELECT `�b�P`, LEFT(`�b�P`,4) FROM `�s�P�Q`;
-SELECT `�b�P`, LEFT(`�b�P`,5) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -136,6 +109,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_left_ucs2.test b/mysql-test/suite/jp/t/jp_left_ucs2.test
index 59d10b7d736..3d55283c6ac 100644
--- a/mysql-test/suite/jp/t/jp_left_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_left_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`;
@@ -89,7 +81,7 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ６`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ６`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ７`;
@@ -109,26 +101,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ９`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ９`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -138,6 +110,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_left_ujis.test b/mysql-test/suite/jp/t/jp_left_ujis.test
index 718639cd8a4..04619fa26bb 100644
--- a/mysql-test/suite/jp/t/jp_left_ujis.test
+++ b/mysql-test/suite/jp/t/jp_left_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`;
@@ -88,7 +80,7 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ６`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ６`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ７`;
@@ -108,26 +100,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ９`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ９`;
 SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -137,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_left_utf8.test b/mysql-test/suite/jp/t/jp_left_utf8.test
index f9c99718e0f..0f77c1709d4 100644
--- a/mysql-test/suite/jp/t/jp_left_utf8.test
+++ b/mysql-test/suite/jp/t/jp_left_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��`;
@@ -86,7 +79,7 @@ SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��`;
@@ -106,26 +99,6 @@ SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LEFT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -135,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_length_sjis.test b/mysql-test/suite/jp/t/jp_length_sjis.test
index 7023891b7f0..acc6be975ae 100644
--- a/mysql-test/suite/jp/t/jp_length_sjis.test
+++ b/mysql-test/suite/jp/t/jp_length_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P`;
@@ -57,16 +50,11 @@ SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�S`;
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�T`;
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�V`;
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�W`;
 SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`, LENGTH(`�b�P`) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -76,6 +64,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_length_ucs2.test b/mysql-test/suite/jp/t/jp_length_ucs2.test
index 9951c9b6cd1..41fd81713bf 100644
--- a/mysql-test/suite/jp/t/jp_length_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_length_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`;
@@ -59,16 +51,11 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ４`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ５`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ８`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -78,6 +65,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_length_ujis.test b/mysql-test/suite/jp/t/jp_length_ujis.test
index ac3aef2c768..33a0baa43a9 100644
--- a/mysql-test/suite/jp/t/jp_length_ujis.test
+++ b/mysql-test/suite/jp/t/jp_length_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`;
@@ -58,16 +50,11 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ４`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ５`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ８`;
 SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -77,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_length_utf8.test b/mysql-test/suite/jp/t/jp_length_utf8.test
index 5c5021f37be..ffb5b4fdb5b 100644
--- a/mysql-test/suite/jp/t/jp_length_utf8.test
+++ b/mysql-test/suite/jp/t/jp_length_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
@@ -56,16 +49,11 @@ SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LENGTH(`鐚ｏ��`) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -75,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_like_sjis.test b/mysql-test/suite/jp/t/jp_like_sjis.test
index 5c41b9ff7ef..6cb6092852a 100644
--- a/mysql-test/suite/jp/t/jp_like_sjis.test
+++ b/mysql-test/suite/jp/t/jp_like_sjis.test
@@ -1,4 +1,5 @@
 --character_set sjis
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `�s�P`;
 drop table if exists `�s�Q`;
@@ -9,9 +10,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +25,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +42,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT * FROM `�s�P` WHERE `�b�P` LIKE ' %';
@@ -103,7 +95,7 @@ SELECT * FROM `�s�U` WHERE `�b�P` LIKE '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
 SELECT * FROM `�s�U` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\%';
 SELECT * FROM `�s�U` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 
-#Heap
+#MEMORY
 SELECT * FROM `�s�V` WHERE `�b�P` LIKE ' %';
 SELECT * FROM `�s�V` WHERE `�b�P` LIKE '% %';
 SELECT * FROM `�s�V` WHERE `�b�P` LIKE '% ';
@@ -128,31 +120,6 @@ SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\';
 SELECT * FROM `�s�X` WHERE `�b�P` LIKE '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\%';
 SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\%';
 SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
-#BDB
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE ' %';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% %';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% ';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '�%';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%忤%';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%�';
-#SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '葦桶患況弦沙悉梢%';
-#SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%葦桶患況弦沙悉梢%';
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%葦桶患況弦沙悉梢';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '�@%';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@%';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '��%';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��%';
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��';
-#SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '�E��������������������������������������%';
-#SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�E��������������������������������������%';
-#SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�E��������������������������������������';
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '�\%';
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\%';
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\';
-#SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\%';
-#SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\%';
-#SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
@@ -163,6 +130,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test
index feae40de49e..1fd7d559e86 100644
--- a/mysql-test/suite/jp/t/jp_like_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_like_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #Insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -125,34 +120,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ')
-,('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('とどなにぬねのはばぱひびぴふぶぷへべぺほ')
-,('ぼぽまみむめもゃやゅゆょよらりるれろゎわ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-
 #INNODB
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '% %';
@@ -205,7 +172,7 @@ SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃�
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE ' %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% ';
@@ -231,32 +198,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃�
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#BDB
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -266,6 +207,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_like_ujis.test b/mysql-test/suite/jp/t/jp_like_ujis.test
index 29ef7c5d48b..dccb49d07d1 100644
--- a/mysql-test/suite/jp/t/jp_like_ujis.test
+++ b/mysql-test/suite/jp/t/jp_like_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -49,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 
 #InnoDB
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
@@ -105,7 +97,7 @@ SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃�
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE ' %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% ';
@@ -130,31 +122,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%齖';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-#BDB
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
-#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
-#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖';
-#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
@@ -165,6 +132,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test
index 4247242029d..4332922f831 100644
--- a/mysql-test/suite/jp/t/jp_like_utf8.test
+++ b/mysql-test/suite/jp/t/jp_like_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +43,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 
 #InnoDB
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE ' %';
@@ -103,7 +96,7 @@ SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�%';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 
-#Heap
+#MEMORY
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE ' %';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '% %';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '% ';
@@ -128,31 +121,6 @@ SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藹�';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�%';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�%';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
-#BDB
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE ' %';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '% %';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '% ';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '鐓�%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐓�鐓�%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐔�';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '���%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '���%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%���';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '��祉��������������������������������������������������������%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%��祉��������������������������������������������������������%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%��祉��������������������������������������������������������';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '藜�%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藜�%';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藹�';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�%';
-#SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` LIKE '%藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -163,6 +131,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_locate_sjis.test b/mysql-test/suite/jp/t/jp_locate_sjis.test
index 92c671199b6..e7a21e0e014 100644
--- a/mysql-test/suite/jp/t/jp_locate_sjis.test
+++ b/mysql-test/suite/jp/t/jp_locate_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,7 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -40,9 +38,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 #InnoDB
 SELECT LOCATE('�',`�b�P`) from `�s�P`;
@@ -85,7 +80,7 @@ SELECT LOCATE('�\',`�b�P`) from `�s�U`;
 SELECT LOCATE('�\',`�b�P`) from `�s�U`;
 
 
-#HEAP
+#MEMORY
 SELECT LOCATE('�',`�b�P`) from `�s�V`;
 SELECT LOCATE('�',`�b�P`) from `�s�V`;
 SELECT LOCATE('�',`�b�P`) from `�s�V`;
@@ -106,27 +101,6 @@ SELECT LOCATE('�\',`�b�P`) from `�s�X`;
 SELECT LOCATE('�\',`�b�P`) from `�s�X`;
 
 
-#BDB
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('�',`�b�P`) from `�s�P�O`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('��',`�b�P`) from `�s�P�P`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-SELECT LOCATE('�\',`�b�P`) from `�s�P�Q`;
-
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -136,6 +110,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_locate_ucs2.test b/mysql-test/suite/jp/t/jp_locate_ucs2.test
index d00ad67235a..02b95a20eda 100644
--- a/mysql-test/suite/jp/t/jp_locate_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_locate_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -43,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
@@ -88,7 +82,7 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ６`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ６`;
 
 
-#HEAP
+#MEMORY
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`;
@@ -109,27 +103,6 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ９`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
 
 
-#BDB
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`;
-
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -139,6 +112,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_locate_ujis.test b/mysql-test/suite/jp/t/jp_locate_ujis.test
index 5375fad75db..21e3fa1dbbb 100644
--- a/mysql-test/suite/jp/t/jp_locate_ujis.test
+++ b/mysql-test/suite/jp/t/jp_locate_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -42,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
@@ -87,7 +81,7 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ６`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ６`;
 
 
-#HEAP
+#MEMORY
 SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`;
 SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`;
@@ -108,27 +102,6 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ９`;
 SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`;
 
 
-#BDB
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`;
-SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`;
-
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -138,6 +111,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test
index cbf6714e322..6e965eaffa9 100644
--- a/mysql-test/suite/jp/t/jp_locate_utf8.test
+++ b/mysql-test/suite/jp/t/jp_locate_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,7 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -40,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��`;
@@ -85,7 +80,7 @@ SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��`;
 SELECT LOCATE('筝�',`鐚ｏ��`) from `鐚器��`;
 
 
-#HEAP
+#MEMORY
 SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��`;
 SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��`;
 SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��`;
@@ -106,27 +101,6 @@ SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��`;
 SELECT LOCATE('筝�',`鐚ｏ��`) from `鐚器��`;
 
 
-#BDB
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('鐔�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('鐓�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('���',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('蘊�',`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LOCATE('筝�',`鐚ｏ��`) from `鐚器��鐚�`;
-
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -136,6 +110,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_sjis.test b/mysql-test/suite/jp/t/jp_lpad_sjis.test
index 7038112cbc8..1516acc14d2 100644
--- a/mysql-test/suite/jp/t/jp_lpad_sjis.test
+++ b/mysql-test/suite/jp/t/jp_lpad_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�P`;
@@ -57,16 +50,11 @@ SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�S`;
 SELECT `�b�P`, LPAD(`�b�P`,5,'�w') FROM `�s�T`;
 SELECT `�b�P`, LPAD(`�b�P`,5,'�\' ) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�V`;
 SELECT `�b�P`, LPAD(`�b�P`,5,'�w') FROM `�s�W`;
 SELECT `�b�P`, LPAD(`�b�P`,5,'�\' ) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, LPAD(`�b�P`,5,'�') FROM `�s�P�O`;
-SELECT `�b�P`, LPAD(`�b�P`,5,'�w') FROM `�s�P�P`;
-SELECT `�b�P`, LPAD(`�b�P`,5,'�\' ) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -76,6 +64,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_ucs2.test b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
index e3bead0855a..3f8e9fd9eb6 100644
--- a/mysql-test/suite/jp/t/jp_lpad_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
@@ -59,16 +51,11 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -78,6 +65,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_ujis.test b/mysql-test/suite/jp/t/jp_lpad_ujis.test
index eea4877ec3a..9d4ef185b47 100644
--- a/mysql-test/suite/jp/t/jp_lpad_ujis.test
+++ b/mysql-test/suite/jp/t/jp_lpad_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
@@ -58,16 +50,11 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
 SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -77,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_lpad_utf8.test b/mysql-test/suite/jp/t/jp_lpad_utf8.test
index 599bf5eba28..b629751d184 100644
--- a/mysql-test/suite/jp/t/jp_lpad_utf8.test
+++ b/mysql-test/suite/jp/t/jp_lpad_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
@@ -56,16 +49,11 @@ SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, LPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -75,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_sjis.test b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
index 864238df07c..4a02fcdc0bd 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,7 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 --enable_warnings
 
 #
@@ -25,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�P` VALUES (' 渦慨�');
@@ -104,30 +102,6 @@ INSERT INTO `�s�X` VALUES ('   �\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�@�\�\�\�\�\');
 INSERT INTO `�s�X` VALUES ('�@�@�@�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES (' 渦慨�');
-INSERT INTO `�s�P�O` VALUES ('  渦慨�');
-INSERT INTO `�s�P�O` VALUES ('   渦慨�');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�O` VALUES ('�@渦慨�');
-INSERT INTO `�s�P�O` VALUES ('�@�@渦慨�');
-INSERT INTO `�s�P�O` VALUES ('�@�@�@渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES (' ����������');
-INSERT INTO `�s�P�P` VALUES ('  ����������');
-INSERT INTO `�s�P�P` VALUES ('   ����������');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�P` VALUES ('�@����������');
-INSERT INTO `�s�P�P` VALUES ('�@�@����������');
-INSERT INTO `�s�P�P` VALUES ('�@�@�@����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES (' �\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('  �\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('   �\�\�\�\�\');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�Q` VALUES ('�@�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�@�@�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�@�@�@�\�\�\�\�\');
 
 #InnoDB
 SELECT LTRIM(`�b�P`) from `�s�P`;
@@ -139,16 +113,11 @@ SELECT LTRIM(`�b�P`) from `�s�S`;
 SELECT LTRIM(`�b�P`) from `�s�T`;
 SELECT LTRIM(`�b�P`) from `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT LTRIM(`�b�P`) from `�s�V`;
 SELECT LTRIM(`�b�P`) from `�s�W`;
 SELECT LTRIM(`�b�P`) from `�s�X`;
 
-#BDB
-SELECT LTRIM(`�b�P`) from `�s�P�O`;
-SELECT LTRIM(`�b�P`) from `�s�P�P`;
-SELECT LTRIM(`�b�P`) from `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -158,6 +127,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
index 0ae647f5222..65ea8d01610 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ');
@@ -106,30 +103,6 @@ INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　　龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('  ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１０` VALUES ('　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES (' あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('  あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１１` VALUES ('　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　　あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('  龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１２` VALUES ('　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　　龔龖龗龞龡');
 
 #InnoDB
 SELECT LTRIM(`Ｃ１`) from `Ｔ１`;
@@ -141,16 +114,11 @@ SELECT LTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT LTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -160,6 +128,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ujis.test b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
index 64363aa330b..9c5487a3c62 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ');
@@ -105,30 +102,6 @@ INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('　　　龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('  ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１０` VALUES ('　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('　　　ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES (' あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('  あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１１` VALUES ('　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('　　　あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('  龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１２` VALUES ('　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('　　　龔龖龗龞龡');
 
 #InnoDB
 SELECT LTRIM(`Ｃ１`) from `Ｔ１`;
@@ -140,16 +113,11 @@ SELECT LTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT LTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -159,6 +127,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
index 846ce11163b..3fcd5cbdc66 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,7 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES (' 鐔縁讐鐔鰹輯鐔�');
@@ -103,30 +101,6 @@ INSERT INTO `鐚器��` VALUES ('   蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('���蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('������蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('���������蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES (' 鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('  鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('   鐔縁讐鐔鰹輯鐔�');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('���鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('������鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES (' ���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('  ���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('   ���������������');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES (' 蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('  蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('   蘊�蘊�蘊�蘊�蘊�');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('���蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('������蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
@@ -138,16 +112,11 @@ SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT LTRIM(`鐚ｏ��`) from `鐚器��`;
 
-#BDB
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT LTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -157,6 +126,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test
index cc93dca2a79..123ac904e50 100644
--- a/mysql-test/suite/jp/t/jp_ps_sjis.test
+++ b/mysql-test/suite/jp/t/jp_ps_sjis.test
@@ -1,3 +1,6 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
+
 --character_set sjis
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -234,15 +237,15 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
-### Test HEAP ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP;
+### Test MEMORY ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY;
 CREATE TABLE t3(
  `�` char(1),
  `��` char(1),
  `�\` char(1)
-)DEFAULT CHARSET = sjis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP;
+)DEFAULT CHARSET = sjis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =MEMORY;
 
 INSERT INTO t1 VALUES ('xxx');
 INSERT INTO t2 VALUES ('����\');
@@ -343,112 +346,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-
-### Test BDB ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t3(
- `�` char(1),
- `��` char(1),
- `�\` char(1)
-)DEFAULT CHARSET = sjis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB;
-INSERT INTO t1 VALUES ('xxx');
-INSERT INTO t2 VALUES ('����\');
-INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
-INSERT INTO t4 VALUES ('�'),('��'),('�\' );
-
-# Japanese parameter for column name
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-# Japanese parameter for function argument
-PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
-PREPARE stmt5 FROM 'SELECT CHARSET(?)';
-PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
-PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
-PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
-PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1';
-PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
-PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
-PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1';
-# Japanese parameter for UPDATE
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-
-## Test jisx0201 ##
-SET @arg = '�';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-
-## Test jisx0208 ##
-SET @arg = '��';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-##Test jisx0212 ##
-SET @arg = '�\';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-DEALLOCATE PREPARE stmt1;
-DEALLOCATE PREPARE stmt2;
-DEALLOCATE PREPARE stmt3;
-DEALLOCATE PREPARE stmt4;
-DEALLOCATE PREPARE stmt5;
-DEALLOCATE PREPARE stmt6;
-DEALLOCATE PREPARE stmt7;
-DEALLOCATE PREPARE stmt8;
-DEALLOCATE PREPARE stmt9;
-DEALLOCATE PREPARE stmt10;
-DEALLOCATE PREPARE stmt11;
-DEALLOCATE PREPARE stmt12;
-DEALLOCATE PREPARE stmt13;
-DEALLOCATE PREPARE stmt14;
-
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
diff --git a/mysql-test/suite/jp/t/jp_ps_ujis.test b/mysql-test/suite/jp/t/jp_ps_ujis.test
index 7d61c12e496..78b86ad57b6 100644
--- a/mysql-test/suite/jp/t/jp_ps_ujis.test
+++ b/mysql-test/suite/jp/t/jp_ps_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -235,15 +236,15 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
-### Test HEAP ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP;
+### Test MEMORY ###
+CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY;
 CREATE TABLE t3(
  `ｱ` char(1),
  `あ` char(1),
  `龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = HEAP;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP;
+)DEFAULT CHARSET = ujis ENGINE = MEMORY;
+CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =MEMORY;
 
 INSERT INTO t1 VALUES ('xxx');
 INSERT INTO t2 VALUES ('ｱあ龔');
@@ -344,112 +345,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-
-### Test BDB ###
-CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t3(
- `ｱ` char(1),
- `あ` char(1),
- `龔` char(1)
-)DEFAULT CHARSET = ujis ENGINE = BDB;
-CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = BDB;
-INSERT INTO t1 VALUES ('xxx');
-INSERT INTO t2 VALUES ('ｱあ龔');
-INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z');
-INSERT INTO t4 VALUES ('ｱ'),('あ'),('龔' );
-
-# Japanese parameter for column name
-PREPARE stmt1 FROM 'SELECT ? FROM t3';
-PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?';
-PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?';
-# Japanese parameter for function argument
-PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)';
-PREPARE stmt5 FROM 'SELECT CHARSET(?)';
-PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1';
-PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2';
-PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2';
-PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1';
-PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2';
-PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1';
-PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1';
-# Japanese parameter for UPDATE
-PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?';
-PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\'';
-
-## Test jisx0201 ##
-SET @arg = 'ｱ';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t3;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t3;
-
-## Test jisx0208 ##
-SET @arg = 'あ';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-##Test jisx0212 ##
-SET @arg = '龔';
-EXECUTE stmt1 USING @arg;
-EXECUTE stmt2 USING @arg;
-EXECUTE stmt3 USING @arg;
-EXECUTE stmt4 USING @arg;
-EXECUTE stmt5 USING @arg;
-EXECUTE stmt6 USING @arg;
-EXECUTE stmt7 USING @arg;
-EXECUTE stmt8 USING @arg;
-EXECUTE stmt9 USING @arg;
-EXECUTE stmt10 USING @arg;
-EXECUTE stmt11 USING @arg;
-EXECUTE stmt12 USING @arg;
-EXECUTE stmt13 USING @arg;
-SELECT * FROM t4;
-EXECUTE stmt14 USING @arg;
-SELECT * FROM t4;
-
-DEALLOCATE PREPARE stmt1;
-DEALLOCATE PREPARE stmt2;
-DEALLOCATE PREPARE stmt3;
-DEALLOCATE PREPARE stmt4;
-DEALLOCATE PREPARE stmt5;
-DEALLOCATE PREPARE stmt6;
-DEALLOCATE PREPARE stmt7;
-DEALLOCATE PREPARE stmt8;
-DEALLOCATE PREPARE stmt9;
-DEALLOCATE PREPARE stmt10;
-DEALLOCATE PREPARE stmt11;
-DEALLOCATE PREPARE stmt12;
-DEALLOCATE PREPARE stmt13;
-DEALLOCATE PREPARE stmt14;
-
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
diff --git a/mysql-test/suite/jp/t/jp_replace_sjis.test b/mysql-test/suite/jp/t/jp_replace_sjis.test
index 811d3350a34..ab29b87545d 100644
--- a/mysql-test/suite/jp/t/jp_replace_sjis.test
+++ b/mysql-test/suite/jp/t/jp_replace_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `�s�S` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 #InnoDB
 SELECT REPLACE(`�b�P`,'�','臼') FROM `�s�P`;
@@ -81,7 +74,7 @@ SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�U`;
 SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�U`;
 SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT REPLACE(`�b�P`,'�','臼') FROM `�s�V`;
 SELECT REPLACE(`�b�P`,'�','臆') FROM `�s�V`;
 SELECT REPLACE(`�b�P`,'�','崖') FROM `�s�V`;
@@ -98,23 +91,6 @@ SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�X`;
 SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�X`;
 SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�X`;
 
-#BDB
-SELECT REPLACE(`�b�P`,'�','臼') FROM `�s�P�O`;
-SELECT REPLACE(`�b�P`,'�','臆') FROM `�s�P�O`;
-SELECT REPLACE(`�b�P`,'�','崖') FROM `�s�P�O`;
-SELECT REPLACE(`�b�P`,'�','幹') FROM `�s�P�O`;
-SELECT REPLACE(`�b�P`,'�','亀') FROM `�s�P�O`;
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-SELECT REPLACE(`�b�P`,'��','����') FROM `�s�P�P`;
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-SELECT REPLACE(`�b�P`,'�\','�\�\') FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -124,6 +100,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_replace_ucs2.test b/mysql-test/suite/jp/t/jp_replace_ucs2.test
index 7739a30cd9c..fc9982ca6a7 100644
--- a/mysql-test/suite/jp/t/jp_replace_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_replace_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
@@ -83,7 +75,7 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ６`;
 SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ６`;
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ７`;
 SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ７`;
 SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ７`;
@@ -100,23 +92,6 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ９`;
 SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ９`;
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`;
 
-#BDB
-SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -126,6 +101,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_replace_ujis.test b/mysql-test/suite/jp/t/jp_replace_ujis.test
index 3d8724e63d5..a830dcd9435 100644
--- a/mysql-test/suite/jp/t/jp_replace_ujis.test
+++ b/mysql-test/suite/jp/t/jp_replace_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
@@ -82,7 +74,7 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ６`;
 SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ６`;
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ７`;
 SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ７`;
 SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ７`;
@@ -99,23 +91,6 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ９`;
 SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ９`;
 SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`;
 
-#BDB
-SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
-SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
-SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`;
-SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -125,6 +100,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_replace_utf8.test b/mysql-test/suite/jp/t/jp_replace_utf8.test
index 1d89a43648b..fe5d3167be8 100644
--- a/mysql-test/suite/jp/t/jp_replace_utf8.test
+++ b/mysql-test/suite/jp/t/jp_replace_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲') FROM `鐚器��`;
@@ -80,7 +73,7 @@ SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝') FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔駕讐') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔鰹蹴') FROM `鐚器��`;
@@ -97,23 +90,6 @@ SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��`;
 SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝') FROM `鐚器��`;
 
-#BDB
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔縁襲') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔駕讐') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔鰹蹴') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔器輯') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'鐔�','鐔居週') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'���','������') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊�蘊�') FROM `鐚器��鐚�`;
-SELECT REPLACE(`鐚ｏ��`,'蘊�','蘊♂勝') FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -123,6 +99,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_sjis.test b/mysql-test/suite/jp/t/jp_reverse_sjis.test
index c1e2b2a17ca..2acc9bf9f59 100644
--- a/mysql-test/suite/jp/t/jp_reverse_sjis.test
+++ b/mysql-test/suite/jp/t/jp_reverse_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 #InnoDB
 SELECT REVERSE(`�b�P`) FROM `�s�P`;
@@ -57,16 +50,11 @@ SELECT REVERSE(`�b�P`) FROM `�s�S`;
 SELECT REVERSE(`�b�P`) FROM `�s�T`;
 SELECT REVERSE(`�b�P`) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT REVERSE(`�b�P`) FROM `�s�V`;
 SELECT REVERSE(`�b�P`) FROM `�s�W`;
 SELECT REVERSE(`�b�P`) FROM `�s�X`;
 
-#BDB
-SELECT REVERSE(`�b�P`) FROM `�s�P�O`;
-SELECT REVERSE(`�b�P`) FROM `�s�P�P`;
-SELECT REVERSE(`�b�P`) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -76,6 +64,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_ucs2.test b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
index d91ec7f70e8..3bf2d49285f 100644
--- a/mysql-test/suite/jp/t/jp_reverse_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`;
@@ -59,16 +51,11 @@ SELECT REVERSE(`Ｃ１`) FROM `Ｔ４`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ５`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ７`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ８`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`;
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`;
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -78,6 +65,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_ujis.test b/mysql-test/suite/jp/t/jp_reverse_ujis.test
index d37d363f59a..0e6ea60e9f6 100644
--- a/mysql-test/suite/jp/t/jp_reverse_ujis.test
+++ b/mysql-test/suite/jp/t/jp_reverse_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`;
@@ -58,16 +50,11 @@ SELECT REVERSE(`Ｃ１`) FROM `Ｔ４`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ５`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ７`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ８`;
 SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`;
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`;
-SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -77,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_reverse_utf8.test b/mysql-test/suite/jp/t/jp_reverse_utf8.test
index 4e53d4be049..ce49b571294 100644
--- a/mysql-test/suite/jp/t/jp_reverse_utf8.test
+++ b/mysql-test/suite/jp/t/jp_reverse_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 #InnoDB
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
@@ -56,16 +49,11 @@ SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��`;
 
-#BDB
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT REVERSE(`鐚ｏ��`) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -75,6 +63,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_right_sjis.test b/mysql-test/suite/jp/t/jp_right_sjis.test
index f481ec532ec..8cde42333c6 100644
--- a/mysql-test/suite/jp/t/jp_right_sjis.test
+++ b/mysql-test/suite/jp/t/jp_right_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P`;
@@ -87,7 +80,7 @@ SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�U`;
 SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�U`;
 SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�V`;
 SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�V`;
 SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�V`;
@@ -107,26 +100,6 @@ SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�X`;
 SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�X`;
 SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�O`;
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�P`;
-SELECT `�b�P`, RIGHT(`�b�P`,0) FROM `�s�P�Q`;
-SELECT `�b�P`, RIGHT(`�b�P`,1) FROM `�s�P�Q`;
-SELECT `�b�P`, RIGHT(`�b�P`,2) FROM `�s�P�Q`;
-SELECT `�b�P`, RIGHT(`�b�P`,3) FROM `�s�P�Q`;
-SELECT `�b�P`, RIGHT(`�b�P`,4) FROM `�s�P�Q`;
-SELECT `�b�P`, RIGHT(`�b�P`,5) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -136,6 +109,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_right_ucs2.test b/mysql-test/suite/jp/t/jp_right_ucs2.test
index 23ca2fa4fae..bb914787f81 100644
--- a/mysql-test/suite/jp/t/jp_right_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_right_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
@@ -89,7 +81,7 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ７`;
@@ -109,26 +101,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -138,6 +110,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test
index b5284489c7e..bb478af7b66 100644
--- a/mysql-test/suite/jp/t/jp_right_ujis.test
+++ b/mysql-test/suite/jp/t/jp_right_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`;
@@ -88,7 +80,7 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ６`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ７`;
@@ -108,26 +100,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ９`;
 SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -137,6 +109,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_right_utf8.test b/mysql-test/suite/jp/t/jp_right_utf8.test
index 863755c1dcf..0f435fb54ed 100644
--- a/mysql-test/suite/jp/t/jp_right_utf8.test
+++ b/mysql-test/suite/jp/t/jp_right_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��`;
@@ -86,7 +79,7 @@ SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��`;
@@ -106,26 +99,6 @@ SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RIGHT(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -135,6 +108,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_sjis.test b/mysql-test/suite/jp/t/jp_rpad_sjis.test
index cc008631548..16715ee7e93 100644
--- a/mysql-test/suite/jp/t/jp_rpad_sjis.test
+++ b/mysql-test/suite/jp/t/jp_rpad_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�P`;
@@ -57,16 +50,11 @@ SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�S`;
 SELECT `�b�P`, RPAD(`�b�P`,5,'�w') FROM `�s�T`;
 SELECT `�b�P`, RPAD(`�b�P`,5,'�\' ) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�V`;
 SELECT `�b�P`, RPAD(`�b�P`,5,'�w') FROM `�s�W`;
 SELECT `�b�P`, RPAD(`�b�P`,5,'�\' ) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, RPAD(`�b�P`,5,'�') FROM `�s�P�O`;
-SELECT `�b�P`, RPAD(`�b�P`,5,'�w') FROM `�s�P�P`;
-SELECT `�b�P`, RPAD(`�b�P`,5,'�\' ) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -76,6 +64,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_ucs2.test b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
index ca5059497d3..9f39c20e7a9 100644
--- a/mysql-test/suite/jp/t/jp_rpad_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
@@ -59,16 +51,11 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -78,6 +65,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_ujis.test b/mysql-test/suite/jp/t/jp_rpad_ujis.test
index d7725b80af7..ad150f36587 100644
--- a/mysql-test/suite/jp/t/jp_rpad_ujis.test
+++ b/mysql-test/suite/jp/t/jp_rpad_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
@@ -58,16 +50,11 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`;
 SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -77,6 +64,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rpad_utf8.test b/mysql-test/suite/jp/t/jp_rpad_utf8.test
index b5a335bc6ce..329165f1abc 100644
--- a/mysql-test/suite/jp/t/jp_rpad_utf8.test
+++ b/mysql-test/suite/jp/t/jp_rpad_utf8.test
@@ -1,3 +1,6 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +11,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +39,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
@@ -56,16 +50,11 @@ SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��`;
 SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐔�') FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'鐚�') FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, RPAD(`鐚ｏ��`,5,'筝�' ) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -75,6 +64,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_sjis.test b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
index c80cf9410f9..6a9ded05bec 100644
--- a/mysql-test/suite/jp/t/jp_rtrim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,7 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
 --enable_warnings
 
 #
@@ -25,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(8), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�P` VALUES ('渦慨� ');
@@ -104,30 +102,6 @@ INSERT INTO `�s�X` VALUES ('�\�\�\�\�\   ');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@�@');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�@�@�@');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES ('渦慨� ');
-INSERT INTO `�s�P�O` VALUES ('渦慨�  ');
-INSERT INTO `�s�P�O` VALUES ('渦慨�   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�O` VALUES ('渦慨��@');
-INSERT INTO `�s�P�O` VALUES ('渦慨��@�@');
-INSERT INTO `�s�P�O` VALUES ('渦慨��@�@�@');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES ('���������� ');
-INSERT INTO `�s�P�P` VALUES ('����������  ');
-INSERT INTO `�s�P�P` VALUES ('����������   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�P` VALUES ('�����������@');
-INSERT INTO `�s�P�P` VALUES ('�����������@�@');
-INSERT INTO `�s�P�P` VALUES ('�����������@�@�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\ ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\  ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@�@');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�@�@�@');
 
 #InnoDB
 SELECT RTRIM(`�b�P`) from `�s�P`;
@@ -139,16 +113,11 @@ SELECT RTRIM(`�b�P`) from `�s�S`;
 SELECT RTRIM(`�b�P`) from `�s�T`;
 SELECT RTRIM(`�b�P`) from `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT RTRIM(`�b�P`) from `�s�V`;
 SELECT RTRIM(`�b�P`) from `�s�W`;
 SELECT RTRIM(`�b�P`) from `�s�X`;
 
-#BDB
-SELECT RTRIM(`�b�P`) from `�s�P�O`;
-SELECT RTRIM(`�b�P`) from `�s�P�P`;
-SELECT RTRIM(`�b�P`) from `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -158,6 +127,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
index 0fac38d12d1..84cd1ce4b2a 100644
--- a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
@@ -106,30 +103,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡   ');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 
 #InnoDB
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
@@ -141,16 +114,11 @@ SELECT RTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT RTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -160,6 +128,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ujis.test b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
index 46cda84dd55..5037419d616 100644
--- a/mysql-test/suite/jp/t/jp_rtrim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
@@ -105,30 +102,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡   ');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 
 #InnoDB
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
@@ -140,16 +113,11 @@ SELECT RTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT RTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -159,6 +127,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_rtrim_utf8.test b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
index 4880a42db3e..f1161d16be7 100644
--- a/mysql-test/suite/jp/t/jp_rtrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,7 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(8), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔� ');
@@ -103,30 +101,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�   ');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜��');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜�����');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊＜��������');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔� ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�  ');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣��');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣�����');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔泣��������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('��������������� ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������  ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊� ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�  ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜��');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜�����');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＜��������');
 
 #InnoDB
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
@@ -138,16 +112,11 @@ SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 SELECT RTRIM(`鐚ｏ��`) from `鐚器��`;
 
-#BDB
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-SELECT RTRIM(`鐚ｏ��`) from `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -157,6 +126,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_select_sjis.test b/mysql-test/suite/jp/t/jp_select_sjis.test
index d84ed7a4b2c..f96dfadcef2 100644
--- a/mysql-test/suite/jp/t/jp_select_sjis.test
+++ b/mysql-test/suite/jp/t/jp_select_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -48,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT * FROM `�s�P`;
@@ -60,14 +53,10 @@ SELECT * FROM `�s�R`;
 SELECT * FROM `�s�S`;
 SELECT * FROM `�s�T`;
 SELECT * FROM `�s�U`;
-#Heap
+#MEMORY
 SELECT * FROM `�s�V`;
 SELECT * FROM `�s�W`;
 SELECT * FROM `�s�X`;
-#BDB
-SELECT * FROM `�s�P�O`;
-SELECT * FROM `�s�P�P`;
-SELECT * FROM `�s�P�Q`;
 
 drop table `�s�P`;
 drop table `�s�Q`;
@@ -78,6 +67,3 @@ drop table `�s�U`;
 drop table `�s�V`;
 drop table `�s�W`;
 drop table `�s�X`;
-drop table `�s�P�O`;
-drop table `�s�P�P`;
-drop table `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test
index 2e4602e7ea4..9acca2d6dfb 100644
--- a/mysql-test/suite/jp/t/jp_select_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_select_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -32,9 +30,6 @@ CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myi
 CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
 CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
 CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb;
 
 #INSERT the following data in each table
 # jisx0201 hankaku-katakana data
@@ -116,31 +111,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-
 #InnoDB
 SELECT * FROM `Ｔ１`;
 SELECT * FROM `Ｔ２`;
@@ -153,10 +123,6 @@ SELECT * FROM `Ｔ６`;
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
-#BDB
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
 
 drop table `Ｔ１`;
 drop table `Ｔ２`;
@@ -167,6 +133,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_select_ujis.test b/mysql-test/suite/jp/t/jp_select_ujis.test
index 4ad9e581a92..0c01e614cfb 100644
--- a/mysql-test/suite/jp/t/jp_select_ujis.test
+++ b/mysql-test/suite/jp/t/jp_select_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = inn
 CREATE TABLE `Ｔ４` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -49,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 
 #InnoDB
 SELECT * FROM `Ｔ１`;
@@ -61,14 +53,10 @@ SELECT * FROM `Ｔ３`;
 SELECT * FROM `Ｔ４`;
 SELECT * FROM `Ｔ５`;
 SELECT * FROM `Ｔ６`;
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
-#BDB
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
 
 drop table `Ｔ１`;
 drop table `Ｔ２`;
@@ -79,6 +67,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test
index e614b9ccfb0..08157ccec11 100644
--- a/mysql-test/suite/jp/t/jp_select_utf8.test
+++ b/mysql-test/suite/jp/t/jp_select_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = i
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +43,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 
 #InnoDB
 SELECT * FROM `鐚器��`;
@@ -59,14 +52,10 @@ SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
-#Heap
+#MEMORY
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
-#BDB
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
 
 drop table `鐚器��`;
 drop table `鐚器��`;
@@ -77,6 +66,3 @@ drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
 drop table `鐚器��`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
-drop table `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_subquery_sjis.test b/mysql-test/suite/jp/t/jp_subquery_sjis.test
index 5292c7a2519..aaaa71b0d39 100644
--- a/mysql-test/suite/jp/t/jp_subquery_sjis.test
+++ b/mysql-test/suite/jp/t/jp_subquery_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -33,18 +32,12 @@ CREATE TABLE `�s�Ta` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine
 CREATE TABLE `�s�Tb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ua` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�Ub` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Oa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Ob` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Pb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�Qb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap;
+CREATE TABLE `�s�Va` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Vb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Wb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xa` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�Xb` (`�b�P` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -69,12 +62,6 @@ INSERT INTO `�s�Wa` VALUES ('��'),('��'),('��');
 INSERT INTO `�s�Wb` VALUES ('��');
 INSERT INTO `�s�Xa` VALUES ('�\'),('�\'),('�\');
 INSERT INTO `�s�Xb` VALUES ('�\');
-INSERT INTO `�s�P�Oa` VALUES ('�'),('�'),('�');
-INSERT INTO `�s�P�Ob` VALUES ('�');
-INSERT INTO `�s�P�Pa` VALUES ('��'),('��'),('��');
-INSERT INTO `�s�P�Pb` VALUES ('��');
-INSERT INTO `�s�P�Qa` VALUES ('�\'),('�\'),('�\');
-INSERT INTO `�s�P�Qb` VALUES ('�\');
 
 #Test for innodb
 SELECT `�b�P` FROM `�s�Pa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�Pb`);
@@ -104,15 +91,6 @@ SELECT `�b�P` FROM `�s�Wa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�Wb` WHERE `�
 SELECT `�b�P` FROM `�s�Xa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�Xb`);
 SELECT `�b�P` FROM `�s�Xa` WHERE EXISTS (SELECT `�b�P` FROM `�s�Xb` WHERE `�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
 SELECT `�b�P` FROM `�s�Xa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�Xb` WHERE `�s�Xa`.`�b�P` = `�s�Xb`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Oa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Ob`);
-SELECT `�b�P` FROM `�s�P�Oa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Ob` WHERE `�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Oa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Ob` WHERE `�s�P�Oa`.`�b�P` = `�s�P�Ob`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Pa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Pb`);
-SELECT `�b�P` FROM `�s�P�Pa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Pb` WHERE `�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Pa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Pb` WHERE `�s�P�Pa`.`�b�P` = `�s�P�Pb`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Qa` WHERE `�b�P` IN (SELECT `�b�P` FROM `�s�P�Qb`);
-SELECT `�b�P` FROM `�s�P�Qa` WHERE EXISTS (SELECT `�b�P` FROM `�s�P�Qb` WHERE `�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
-SELECT `�b�P` FROM `�s�P�Qa` WHERE NOT EXISTS (SELECT `�b�P` FROM `�s�P�Qb` WHERE `�s�P�Qa`.`�b�P` = `�s�P�Qb`.`�b�P`);
 
 DROP TABLE `�s�Pa`;
 DROP TABLE `�s�Pb`;
@@ -132,9 +110,3 @@ DROP TABLE `�s�Wa`;
 DROP TABLE `�s�Wb`;
 DROP TABLE `�s�Xa`;
 DROP TABLE `�s�Xb`;
-DROP TABLE `�s�P�Oa`;
-DROP TABLE `�s�P�Ob`;
-DROP TABLE `�s�P�Pa`;
-DROP TABLE `�s�P�Pb`;
-DROP TABLE `�s�P�Qa`;
-DROP TABLE `�s�P�Qb`;
diff --git a/mysql-test/suite/jp/t/jp_subquery_ucs2.test b/mysql-test/suite/jp/t/jp_subquery_ucs2.test
index 311433438f4..1361235f8a5 100644
--- a/mysql-test/suite/jp/t/jp_subquery_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_subquery_ucs2.test
@@ -1,18 +1,25 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 --enable_warnings
 
 #
@@ -35,18 +42,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine
 CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -71,12 +72,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 
 #Test for innodb
 SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`);
@@ -106,15 +101,6 @@ SELECT `Ｃ１` FROM `Ｔ８a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ８b` WHERE `�
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ９b`);
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
 
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
@@ -134,10 +120,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
-
diff --git a/mysql-test/suite/jp/t/jp_subquery_ujis.test b/mysql-test/suite/jp/t/jp_subquery_ujis.test
index 67c9f00fd85..1132f47031d 100644
--- a/mysql-test/suite/jp/t/jp_subquery_ujis.test
+++ b/mysql-test/suite/jp/t/jp_subquery_ujis.test
@@ -1,18 +1,25 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
-drop table if exists `Ｔ１`;
-drop table if exists `Ｔ２`;
-drop table if exists `Ｔ３`;
-drop table if exists `Ｔ４`;
-drop table if exists `Ｔ５`;
-drop table if exists `Ｔ６`;
-drop table if exists `Ｔ７`;
-drop table if exists `Ｔ８`;
-drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
+DROP TABLE IF EXISTS `Ｔ１a`;
+DROP TABLE IF EXISTS `Ｔ１b`;
+DROP TABLE IF EXISTS `Ｔ２a`;
+DROP TABLE IF EXISTS `Ｔ２b`;
+DROP TABLE IF EXISTS `Ｔ３a`;
+DROP TABLE IF EXISTS `Ｔ３b`;
+DROP TABLE IF EXISTS `Ｔ４a`;
+DROP TABLE IF EXISTS `Ｔ４b`;
+DROP TABLE IF EXISTS `Ｔ５a`;
+DROP TABLE IF EXISTS `Ｔ５b`;
+DROP TABLE IF EXISTS `Ｔ６a`;
+DROP TABLE IF EXISTS `Ｔ６b`;
+DROP TABLE IF EXISTS `Ｔ７a`;
+DROP TABLE IF EXISTS `Ｔ７b`;
+DROP TABLE IF EXISTS `Ｔ８a`;
+DROP TABLE IF EXISTS `Ｔ８b`;
+DROP TABLE IF EXISTS `Ｔ９a`;
+DROP TABLE IF EXISTS `Ｔ９b`;
 --enable_warnings
 
 #
@@ -34,18 +41,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine
 CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -70,12 +71,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `Ｔ９b` VALUES ('龔');
-INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ');
-INSERT INTO `Ｔ１０b` VALUES ('ｱ');
-INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ');
-INSERT INTO `Ｔ１１b` VALUES ('あ');
-INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１２b` VALUES ('龔');
 
 #Test for innodb
 SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`);
@@ -105,15 +100,6 @@ SELECT `Ｃ１` FROM `Ｔ８a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ８b` WHERE `�
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ９b`);
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
 SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
-SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`);
 
 DROP TABLE `Ｔ１a`;
 DROP TABLE `Ｔ１b`;
@@ -133,10 +119,3 @@ DROP TABLE `Ｔ８a`;
 DROP TABLE `Ｔ８b`;
 DROP TABLE `Ｔ９a`;
 DROP TABLE `Ｔ９b`;
-DROP TABLE `Ｔ１０a`;
-DROP TABLE `Ｔ１０b`;
-DROP TABLE `Ｔ１１a`;
-DROP TABLE `Ｔ１１b`;
-DROP TABLE `Ｔ１２a`;
-DROP TABLE `Ｔ１２b`;
-
diff --git a/mysql-test/suite/jp/t/jp_subquery_utf8.test b/mysql-test/suite/jp/t/jp_subquery_utf8.test
index 97c2df8ce30..c9df0a4ac34 100644
--- a/mysql-test/suite/jp/t/jp_subquery_utf8.test
+++ b/mysql-test/suite/jp/t/jp_subquery_utf8.test
@@ -1,3 +1,6 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +11,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -32,18 +32,12 @@ CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 eng
 CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��a` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��b` (`鐚ｏ��` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -68,12 +62,6 @@ INSERT INTO `鐚器��a` VALUES ('���'),('���'),('���');
 INSERT INTO `鐚器��b` VALUES ('���');
 INSERT INTO `鐚器��a` VALUES ('蘊�'),('蘊�'),('蘊�');
 INSERT INTO `鐚器��b` VALUES ('蘊�');
-INSERT INTO `鐚器��鐚�a` VALUES ('鐔�'),('鐔�'),('鐔�');
-INSERT INTO `鐚器��鐚�b` VALUES ('鐔�');
-INSERT INTO `鐚器��鐚�a` VALUES ('���'),('���'),('���');
-INSERT INTO `鐚器��鐚�b` VALUES ('���');
-INSERT INTO `鐚器��鐚�a` VALUES ('蘊�'),('蘊�'),('蘊�');
-INSERT INTO `鐚器��鐚�b` VALUES ('蘊�');
 
 #Test for innodb
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
@@ -85,6 +73,7 @@ SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b`
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
+#Test for myisam
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
@@ -94,6 +83,7 @@ SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b`
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
+#Test for memory
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
@@ -103,15 +93,6 @@ SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b`
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��b`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
 SELECT `鐚ｏ��` FROM `鐚器��a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��b` WHERE `鐚器��a`.`鐚ｏ��` = `鐚器��b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE `鐚ｏ��` IN (SELECT `鐚ｏ��` FROM `鐚器��鐚�b`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
-SELECT `鐚ｏ��` FROM `鐚器��鐚�a` WHERE NOT EXISTS (SELECT `鐚ｏ��` FROM `鐚器��鐚�b` WHERE `鐚器��鐚�a`.`鐚ｏ��` = `鐚器��鐚�b`.`鐚ｏ��`);
 
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
@@ -131,9 +112,3 @@ DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
 DROP TABLE `鐚器��a`;
 DROP TABLE `鐚器��b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
-DROP TABLE `鐚器��鐚�a`;
-DROP TABLE `鐚器��鐚�b`;
diff --git a/mysql-test/suite/jp/t/jp_substring_sjis.test b/mysql-test/suite/jp/t/jp_substring_sjis.test
index ac929114880..5b956e8e7a2 100644
--- a/mysql-test/suite/jp/t/jp_substring_sjis.test
+++ b/mysql-test/suite/jp/t/jp_substring_sjis.test
@@ -1,3 +1,6 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
+
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +12,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�Q` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
@@ -43,9 +40,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\')
 INSERT INTO `�s�V` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
 INSERT INTO `�s�W` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
-INSERT INTO `�s�P�O` VALUES ('渦慨�'),('渦慨'),('渦�'),('渦'),('�'),('');
-INSERT INTO `�s�P�P` VALUES ('����������'),('��������'),('������'),('����'),('��'),('');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\'),('�\�\�\�\'),('�\�\�\'),('�\�\'),('�\'),('');
 
 #InnoDB
 SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P`;
@@ -223,7 +217,7 @@ SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�U`;
 SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�U`;
 SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�V`;
 SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�V`;
 SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�V`;
@@ -311,94 +305,6 @@ SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�X`;
 SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�X`;
 SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�X`;
 
-#BDB
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�O`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�O`;
-
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�P`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�P`;
-
-SELECT `�b�P`, SUBSTRING(`�b�P`,0) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,2) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,3) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,4) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,5) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,6) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 0) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 2) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 3) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 4) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 5) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 6) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,0) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,1) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,2) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,3) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,4) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,5) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P`,1,6) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 0) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 1) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 2) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 3) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 4) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 5) FROM `�s�P�Q`;
-SELECT `�b�P`, SUBSTRING(`�b�P` FROM 1 FOR 6) FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -408,6 +314,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test
index f3cd5550072..febad324237 100644
--- a/mysql-test/suite/jp/t/jp_substring_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 # Test of SUBSTRING(str,pos) and SUBSTRING(str FROM pos)
 # is not available until the bug #5364 is fixed
@@ -228,7 +220,7 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ７`;
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ７`;
 #SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ７`;
@@ -316,94 +308,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
 
-#BDB
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
-
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
-
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`;
-#SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -413,6 +317,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_substring_ujis.test b/mysql-test/suite/jp/t/jp_substring_ujis.test
index c201c7148da..df35d91cacc 100644
--- a/mysql-test/suite/jp/t/jp_substring_ujis.test
+++ b/mysql-test/suite/jp/t/jp_substring_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('�
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 
 #InnoDB
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１`;
@@ -224,7 +216,7 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ６`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ７`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ７`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ７`;
@@ -312,94 +304,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ９`;
 SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`;
-
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`;
-
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`;
-SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -409,6 +313,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_substring_utf8.test b/mysql-test/suite/jp/t/jp_substring_utf8.test
index 9f88115c899..5408afd8482 100644
--- a/mysql-test/suite/jp/t/jp_substring_utf8.test
+++ b/mysql-test/suite/jp/t/jp_substring_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),(
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
 INSERT INTO `鐚器��` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�'),('鐔縁讐鐔鰹輯'),('鐔縁讐鐔�'),('鐔縁讐'),('鐔�'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������'),('������������'),('���������'),('������'),('���'),('');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�蘊�'),('蘊�蘊�蘊�'),('蘊�蘊�'),('蘊�'),('');
 
 #InnoDB
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��`;
@@ -222,7 +215,7 @@ SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��`;
@@ -310,94 +303,6 @@ SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��`;
 SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��`,1,6) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 0) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 1) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 2) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 3) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 4) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 5) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`, SUBSTRING(`鐚ｏ��` FROM 1 FOR 6) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -407,6 +312,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_trim_sjis.test b/mysql-test/suite/jp/t/jp_trim_sjis.test
index 0f6821605ed..4a2b6b98b54 100644
--- a/mysql-test/suite/jp/t/jp_trim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_trim_sjis.test
@@ -1,219 +1,13 @@
---character_set sjis
---disable_warnings
-drop table if exists `�s�P`;
-drop table if exists `�s�Q`;
-drop table if exists `�s�R`;
-drop table if exists `�s�S`;
-drop table if exists `�s�T`;
-drop table if exists `�s�U`;
-drop table if exists `�s�V`;
-drop table if exists `�s�W`;
-drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
---enable_warnings
-
 #
 # Test TRIM() function with Japanese characters sjis encoding
 #
 
-SET NAMES sjis;
-SET character_set_database = sjis;
-
-CREATE TABLE `�s�P` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�Q` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�R` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
-CREATE TABLE `�s�S` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�T` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�U` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(12), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-
-# Nothing to trim
-INSERT INTO `�s�P` VALUES ('渦慨�');
-# Test data for TRIM(TRAILING [remstr] FROM str)
-INSERT INTO `�s�P` VALUES ('渦慨偽');
-INSERT INTO `�s�P` VALUES ('渦慨偽�');
-INSERT INTO `�s�P` VALUES ('渦慨偽橋');
-# Test data for TRIM(LEADING [remstr] FROM str)
-INSERT INTO `�s�P` VALUES ('怯桶患');
-INSERT INTO `�s�P` VALUES ('橋渦慨�');
-INSERT INTO `�s�P` VALUES ('橋怯桶患');
-# Test data for TRIM(BOTH [remstr] FROM str)
-INSERT INTO `�s�P` VALUES ('橋怯桶患橋�');
-# Test data for TRIM without [remstr] (remove spaces) 
-INSERT INTO `�s�P` VALUES ('   渦慨�   ');
-INSERT INTO `�s�Q` VALUES ('����������');
-INSERT INTO `�s�Q` VALUES ('������������');
-INSERT INTO `�s�Q` VALUES ('��������������');
-INSERT INTO `�s�Q` VALUES ('����������������');
-INSERT INTO `�s�Q` VALUES ('������������');
-INSERT INTO `�s�Q` VALUES ('��������������');
-INSERT INTO `�s�Q` VALUES ('����������������');
-INSERT INTO `�s�Q` VALUES ('����������������������');
-INSERT INTO `�s�Q` VALUES ('   ����������   ');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�R` VALUES ('   �\�\�\�\�\   ');
-
-INSERT INTO `�s�S` VALUES ('渦慨�');
-INSERT INTO `�s�S` VALUES ('渦慨偽');
-INSERT INTO `�s�S` VALUES ('渦慨偽�');
-INSERT INTO `�s�S` VALUES ('渦慨偽橋');
-INSERT INTO `�s�S` VALUES ('怯桶患');
-INSERT INTO `�s�S` VALUES ('橋渦慨�');
-INSERT INTO `�s�S` VALUES ('橋怯桶患');
-INSERT INTO `�s�S` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�S` VALUES ('   渦慨�   ');
-INSERT INTO `�s�T` VALUES ('����������');
-INSERT INTO `�s�T` VALUES ('������������');
-INSERT INTO `�s�T` VALUES ('��������������');
-INSERT INTO `�s�T` VALUES ('����������������');
-INSERT INTO `�s�T` VALUES ('������������');
-INSERT INTO `�s�T` VALUES ('��������������');
-INSERT INTO `�s�T` VALUES ('����������������');
-INSERT INTO `�s�T` VALUES ('����������������������');
-INSERT INTO `�s�T` VALUES ('   ����������   ');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�U` VALUES ('   �\�\�\�\�\   ');
-
-INSERT INTO `�s�V` VALUES ('渦慨�');
-INSERT INTO `�s�V` VALUES ('渦慨偽');
-INSERT INTO `�s�V` VALUES ('渦慨偽�');
-INSERT INTO `�s�V` VALUES ('渦慨偽橋');
-INSERT INTO `�s�V` VALUES ('怯桶患');
-INSERT INTO `�s�V` VALUES ('橋渦慨�');
-INSERT INTO `�s�V` VALUES ('橋怯桶患');
-INSERT INTO `�s�V` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�V` VALUES ('   渦慨�   ');
-INSERT INTO `�s�W` VALUES ('����������');
-INSERT INTO `�s�W` VALUES ('������������');
-INSERT INTO `�s�W` VALUES ('��������������');
-INSERT INTO `�s�W` VALUES ('����������������');
-INSERT INTO `�s�W` VALUES ('������������');
-INSERT INTO `�s�W` VALUES ('��������������');
-INSERT INTO `�s�W` VALUES ('����������������');
-INSERT INTO `�s�W` VALUES ('����������������������');
-INSERT INTO `�s�W` VALUES ('   ����������   ');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�X` VALUES ('   �\�\�\�\�\   ');
-
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽�');
-INSERT INTO `�s�P�O` VALUES ('渦慨偽橋');
-INSERT INTO `�s�P�O` VALUES ('怯桶患');
-INSERT INTO `�s�P�O` VALUES ('橋渦慨�');
-INSERT INTO `�s�P�O` VALUES ('橋怯桶患');
-INSERT INTO `�s�P�O` VALUES ('橋怯桶患橋�');
-INSERT INTO `�s�P�O` VALUES ('   渦慨�   ');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�P` VALUES ('������������');
-INSERT INTO `�s�P�P` VALUES ('��������������');
-INSERT INTO `�s�P�P` VALUES ('����������������');
-INSERT INTO `�s�P�P` VALUES ('������������');
-INSERT INTO `�s�P�P` VALUES ('��������������');
-INSERT INTO `�s�P�P` VALUES ('����������������');
-INSERT INTO `�s�P�P` VALUES ('����������������������');
-INSERT INTO `�s�P�P` VALUES ('   ����������   ');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\�\�\�\�\�\�\');
-INSERT INTO `�s�P�Q` VALUES ('   �\�\�\�\�\   ');
-
-#InnoDB
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P`;
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P`;
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P`;
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�Q`;
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�Q`;
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�Q`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�Q`;
-SELECT `�b�P`,TRIM(TRAILING '�\'FROM `�b�P`) FROM `�s�R`;
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�R`;
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�R`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�R`;
-
-#MyISAM
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�S`;
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�S`;
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�S`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�S`;
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�T`;
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�T`;
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�T`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�T`;
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�U`;
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�U`;
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�U`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�U`;
-
-#HEAP
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�V`;
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�V`;
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�V`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�V`;
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�W`;
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�W`;
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�W`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�W`;
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�X`;
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�X`;
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�X`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�X`;
+--source include/have_innodb.inc
+let $engine = innodb;
+--source suite/jp/include/trim_sjis.inc
 
-#BDB
-SELECT `�b�P`,TRIM(TRAILING '�' FROM `�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`,TRIM(LEADING '�' FROM `�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`,TRIM(BOTH '�' FROM `�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�O`;
-SELECT `�b�P`,TRIM(TRAILING '��' FROM `�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`,TRIM(LEADING '��' FROM `�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`,TRIM(BOTH '��' FROM `�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�P`;
-SELECT `�b�P`,TRIM(TRAILING '�\' FROM `�b�P`) FROM `�s�P�Q`;
-SELECT `�b�P`,TRIM(LEADING '�\' FROM `�b�P`) FROM `�s�P�Q`;
-SELECT `�b�P`,TRIM(BOTH '�\' FROM `�b�P`) FROM `�s�P�Q`;
-SELECT `�b�P`,TRIM(`�b�P`) FROM `�s�P�Q`;
+let $engine = myisam;
+--source suite/jp/include/trim_sjis.inc
 
-DROP TABLE `�s�P`;
-DROP TABLE `�s�Q`;
-DROP TABLE `�s�R`;
-DROP TABLE `�s�S`;
-DROP TABLE `�s�T`;
-DROP TABLE `�s�U`;
-DROP TABLE `�s�V`;
-DROP TABLE `�s�W`;
-DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
+let $engine = memory;
+--source suite/jp/include/trim_sjis.inc
diff --git a/mysql-test/suite/jp/t/jp_trim_ucs2.test b/mysql-test/suite/jp/t/jp_trim_ucs2.test
index 1d8a12650e0..e7205019f18 100644
--- a/mysql-test/suite/jp/t/jp_trim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_trim_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 # Nothing to trim
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
@@ -123,34 +120,6 @@ INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
 INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡   ');
 
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('かあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡   ');
-
 #InnoDB
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
 SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
@@ -179,7 +148,7 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ６`;
 SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ６`;
 SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
@@ -193,20 +162,6 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ９`;
 SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ９`;
 SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(TRAILING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -216,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_trim_ujis.test b/mysql-test/suite/jp/t/jp_trim_ujis.test
index de401217fcf..658d066d5df 100644
--- a/mysql-test/suite/jp/t/jp_trim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_trim_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -26,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 # Nothing to trim
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
@@ -122,34 +119,6 @@ INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡');
 INSERT INTO `Ｔ９` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
 INSERT INTO `Ｔ９` VALUES ('   龔龖龗龞龡   ');
 
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
-INSERT INTO `Ｔ１０` VALUES ('   ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかか');
-INSERT INTO `Ｔ１１` VALUES ('あいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('かあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえお');
-INSERT INTO `Ｔ１１` VALUES ('かかかあいうえおかかか');
-INSERT INTO `Ｔ１１` VALUES ('   あいうえお   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('丂丂丂龔龖龗龞龡丂丂丂');
-INSERT INTO `Ｔ１２` VALUES ('   龔龖龗龞龡   ');
-
 #InnoDB
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
 SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
@@ -178,7 +147,7 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ６`;
 SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ６`;
 SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
 SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`;
@@ -192,20 +161,6 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ９`;
 SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ９`;
 SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`;
 
-#BDB
-SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`;
-SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`;
-SELECT `Ｃ１`,TRIM(TRAILING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ１２`;
-SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -215,6 +170,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_trim_utf8.test b/mysql-test/suite/jp/t/jp_trim_utf8.test
index 0777de15c36..fd258869b9f 100644
--- a/mysql-test/suite/jp/t/jp_trim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_trim_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,7 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -24,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(12), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 # Nothing to trim
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
@@ -120,34 +118,6 @@ INSERT INTO `鐚器��` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
 INSERT INTO `鐚器��` VALUES ('   蘊�蘊�蘊�蘊�蘊�   ');
 
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔居酋鐔駈酋');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈襲鐔駕蹴鐔器週');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔駈襲鐔駕蹴鐔器週');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔駈酋鐔駈襲鐔駕蹴鐔器週鐔駈酋鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('   鐔縁讐鐔鰹輯鐔�   ');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������������������������');
-INSERT INTO `鐚器��鐚�` VALUES ('   ���������������   ');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('筝�筝�筝�蘊�蘊�蘊�蘊�蘊＞��筝�筝�');
-INSERT INTO `鐚器��鐚�` VALUES ('   蘊�蘊�蘊�蘊�蘊�   ');
-
 #InnoDB
 SELECT `鐚ｏ��`,TRIM(TRAILING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(LEADING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
@@ -176,7 +146,7 @@ SELECT `鐚ｏ��`,TRIM(LEADING '筝�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(BOTH '筝�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT `鐚ｏ��`,TRIM(TRAILING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(LEADING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(BOTH '鐔�' FROM `鐚ｏ��`) FROM `鐚器��`;
@@ -190,20 +160,6 @@ SELECT `鐚ｏ��`,TRIM(LEADING '筝�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(BOTH '筝�' FROM `鐚ｏ��`) FROM `鐚器��`;
 SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��`;
 
-#BDB
-SELECT `鐚ｏ��`,TRIM(TRAILING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(LEADING '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(BOTH '鐔�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(TRAILING '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(LEADING '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(BOTH '���' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(TRAILING '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(LEADING '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(BOTH '筝�' FROM `鐚ｏ��`) FROM `鐚器��鐚�`;
-SELECT `鐚ｏ��`,TRIM(`鐚ｏ��`) FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -213,6 +169,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test
index e36d18c85c0..73c9c6607ad 100644
--- a/mysql-test/suite/jp/t/jp_union_ujis.test
+++ b/mysql-test/suite/jp/t/jp_union_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -70,34 +68,10 @@ DROP TABLE `Ｔ１` ;
 DROP TABLE `Ｔ２` ;
 DROP TABLE `Ｔ３` ;
 
-#HEAP
-CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = HEAP;
-INSERT INTO `Ｔ１` VALUES('ｱ'),('ｱ'),('あ'),('あ'),('龔'),('龔');
-INSERT INTO `Ｔ２` VALUES('ｲ'),('ｲ'),('い'),('い'),('龖'),('龖');
-INSERT INTO `Ｔ３` VALUES('ｳ'),('ｳ'),('う'),('う'),('龗'),('龗');
-SELECT * FROM `Ｔ１` UNION DISTINCT SELECT * FROM `Ｔ２` ORDER BY `Ｃ１`;
-SELECT * FROM `Ｔ１` UNION ALL SELECT * FROM `Ｔ２` ORDER BY `Ｃ１`;
-(SELECT * FROM `Ｔ１`) UNION (SELECT * FROM `Ｔ２`) UNION (SELECT 'う') ORDER BY `Ｃ１`;
-(SELECT 'う' AS `Ｃ１`) UNION (SELECT * FROM `Ｔ１`) UNION (SELECT * FROM `Ｔ２`) ORDER BY `Ｃ１`;
-SELECT `Ｃ１`, COUNT(*) FROM `Ｔ１` GROUP BY `Ｃ１` UNION
-SELECT `Ｃ１`, COUNT(*) FROM `Ｔ２` GROUP BY `Ｃ１` ORDER BY `Ｃ１`;
-SELECT * FROM `Ｔ１` UNION DISTINCT
-SELECT * FROM `Ｔ２` UNION ALL
-SELECT * FROM `Ｔ３` ORDER BY `Ｃ１`;
-SELECT * FROM `Ｔ１` UNION ALL
-SELECT * FROM `Ｔ２` UNION DISTINCT
-SELECT * FROM `Ｔ３` ORDER BY `Ｃ１`;
-SELECT * FROM `Ｔ１` UNION SELECT REPEAT(`Ｃ１`,5) FROM `Ｔ２` ORDER BY `Ｃ１`;
-DROP TABLE `Ｔ１` ;
-DROP TABLE `Ｔ２` ;
-DROP TABLE `Ｔ３` ;
-
-#BDB
-CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB; 
-CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB;
-CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = BDB;
+#MEMORY
+CREATE TABLE `Ｔ１` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ２` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ３` (`Ｃ１` char(1), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES('ｱ'),('ｱ'),('あ'),('あ'),('龔'),('龔');
 INSERT INTO `Ｔ２` VALUES('ｲ'),('ｲ'),('い'),('い'),('龖'),('龖');
 INSERT INTO `Ｔ３` VALUES('ｳ'),('ｳ'),('う'),('う'),('龗'),('龗');
diff --git a/mysql-test/suite/jp/t/jp_update_sjis.test b/mysql-test/suite/jp/t/jp_update_sjis.test
index 0dc7372ae92..b977df5fb8a 100644
--- a/mysql-test/suite/jp/t/jp_update_sjis.test
+++ b/mysql-test/suite/jp/t/jp_update_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `�s�S` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(5), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 INSERT INTO `�s�P` VALUES ('渦慨�');
 INSERT INTO `�s�Q` VALUES ('����������');
@@ -43,9 +39,6 @@ INSERT INTO `�s�U` VALUES ('�\�\�\�\�\');
 INSERT INTO `�s�V` VALUES ('渦慨�');
 INSERT INTO `�s�W` VALUES ('����������');
 INSERT INTO `�s�X` VALUES ('�\�\�\�\�\');
-INSERT INTO `�s�P�O` VALUES ('渦慨�');
-INSERT INTO `�s�P�P` VALUES ('����������');
-INSERT INTO `�s�P�Q` VALUES ('�\�\�\�\�\');
 
 UPDATE `�s�P` SET `�b�P` = ('況弦�');
 UPDATE `�s�Q` SET `�b�P` = ('����������');
@@ -56,9 +49,6 @@ UPDATE `�s�U` SET `�b�P` = ('�\�\�\�\�\');
 UPDATE `�s�V` SET `�b�P` = ('況弦�');
 UPDATE `�s�W` SET `�b�P` = ('����������');
 UPDATE `�s�X` SET `�b�P` = ('�\�\�\�\�\');
-UPDATE `�s�P�O` SET `�b�P` = ('況弦�');
-UPDATE `�s�P�P` SET `�b�P` = ('����������');
-UPDATE `�s�P�Q` SET `�b�P` = ('�\�\�\�\�\');
 
 #InnoDB
 SELECT * FROM `�s�P`;
@@ -70,16 +60,11 @@ SELECT * FROM `�s�S`;
 SELECT * FROM `�s�T`;
 SELECT * FROM `�s�U`;
 
-#HEAP
+#MEMORY
 SELECT * FROM `�s�V`;
 SELECT * FROM `�s�W`;
 SELECT * FROM `�s�X`;
 
-#BDB
-SELECT * FROM `�s�P�O`;
-SELECT * FROM `�s�P�P`;
-SELECT * FROM `�s�P�Q`;
-
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -89,6 +74,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test
index 7a3c1233210..33a5ce63f96 100644
--- a/mysql-test/suite/jp/t/jp_update_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_update_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
@@ -58,9 +50,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 
 #InnoDB
 SELECT * FROM `Ｔ１`;
@@ -72,16 +61,11 @@ SELECT * FROM `Ｔ４`;
 SELECT * FROM `Ｔ５`;
 SELECT * FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 
-#BDB
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -91,6 +75,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_update_ujis.test b/mysql-test/suite/jp/t/jp_update_ujis.test
index 852e45b9eeb..3ba009469b2 100644
--- a/mysql-test/suite/jp/t/jp_update_ujis.test
+++ b/mysql-test/suite/jp/t/jp_update_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -44,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
@@ -57,9 +49,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 
 #InnoDB
 SELECT * FROM `Ｔ１`;
@@ -71,16 +60,11 @@ SELECT * FROM `Ｔ４`;
 SELECT * FROM `Ｔ５`;
 SELECT * FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 
-#BDB
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -90,6 +74,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_update_utf8.test b/mysql-test/suite/jp/t/jp_update_utf8.test
index b4b3d18ecab..8dbd046a125 100644
--- a/mysql-test/suite/jp/t/jp_update_utf8.test
+++ b/mysql-test/suite/jp/t/jp_update_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,9 +10,6 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(5), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
@@ -42,9 +38,6 @@ INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 INSERT INTO `鐚器��` VALUES ('鐔縁讐鐔鰹輯鐔�');
 INSERT INTO `鐚器��` VALUES ('���������������');
 INSERT INTO `鐚器��` VALUES ('蘊�蘊�蘊�蘊�蘊�');
-INSERT INTO `鐚器��鐚�` VALUES ('鐔縁讐鐔鰹輯鐔�');
-INSERT INTO `鐚器��鐚�` VALUES ('���������������');
-INSERT INTO `鐚器��鐚�` VALUES ('蘊�蘊�蘊�蘊�蘊�');
 
 UPDATE `鐚器��` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('���������������');
@@ -55,9 +48,6 @@ UPDATE `鐚器��` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('���������������');
 UPDATE `鐚器��` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('鐔駈酬鐔醐醜鐔�');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('���������������');
-UPDATE `鐚器��鐚�` SET `鐚ｏ��` = ('藹�藹�藹�藹�藹�');
 
 #InnoDB
 SELECT * FROM `鐚器��`;
@@ -69,16 +59,11 @@ SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 
-#HEAP
+#MEMORY
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 SELECT * FROM `鐚器��`;
 
-#BDB
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
-SELECT * FROM `鐚器��鐚�`;
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -88,6 +73,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
diff --git a/mysql-test/suite/jp/t/jp_where_sjis.test b/mysql-test/suite/jp/t/jp_where_sjis.test
index 452d137f643..374905727d5 100644
--- a/mysql-test/suite/jp/t/jp_where_sjis.test
+++ b/mysql-test/suite/jp/t/jp_where_sjis.test
@@ -1,3 +1,5 @@
+--source include/have_sjis.inc
+--source include/have_innodb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `�s�P`;
@@ -9,9 +11,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 --enable_warnings
 
 #
@@ -27,12 +26,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -48,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 
 #InnoDB
 SELECT * FROM `�s�P` WHERE `�b�P` = '葦桶患況弦沙悉梢';
@@ -62,33 +55,32 @@ SELECT * FROM `�s�S` WHERE `�b�P` = '葦桶患況弦沙悉梢';
 SELECT * FROM `�s�T` WHERE `�b�P` = '�E��������������������������������������';
 SELECT * FROM `�s�U` WHERE `�b�P` = '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 
-#Heap
+#MEMORY
 SELECT * FROM `�s�V` WHERE `�b�P` = '葦桶患況弦沙悉梢';
 SELECT * FROM `�s�W` WHERE `�b�P` = '�E��������������������������������������';
 SELECT * FROM `�s�X` WHERE `�b�P` = '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 
-#BDB
-SELECT * FROM `�s�P�O` WHERE `�b�P` = '葦桶患況弦沙悉梢';
-SELECT * FROM `�s�P�P` WHERE `�b�P` = '�E��������������������������������������';
-SELECT * FROM `�s�P�Q` WHERE `�b�P` = '�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
-
 #Test to distinguish 0x9353 and 0x9373
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+--enable_warnings
 CREATE TABLE t1(c1 char(1)) default charset = sjis engine=innodb;
 CREATE TABLE t2(c1 char(1)) default charset = sjis engine=myisam;
-CREATE TABLE t3(c1 char(1)) default charset = sjis engine=heap;
-CREATE TABLE t4(c1 char(1)) default charset = sjis engine=bdb;
+CREATE TABLE t3(c1 char(1)) default charset = sjis engine=MEMORY;
 INSERT INTO t1 VALUES('�S'),('�s');
 INSERT INTO t2 VALUES('�S'),('�s');
 INSERT INTO t3 VALUES('�S'),('�s');
-INSERT INTO t4 VALUES('�S'),('�s');
 SELECT * FROM t1 WHERE c1 = '�S';
 SELECT * FROM t2 WHERE c1 = '�S';
 SELECT * FROM t3 WHERE c1 = '�S';
-SELECT * FROM t4 WHERE c1 = '�S';
 SELECT * FROM t1 WHERE c1 = '�s';
 SELECT * FROM t2 WHERE c1 = '�s';
 SELECT * FROM t3 WHERE c1 = '�s';
-SELECT * FROM t4 WHERE c1 = '�s';
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
 
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
@@ -99,6 +91,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;
diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test
index 3b82eacd615..7e035cd28f3 100644
--- a/mysql-test/suite/jp/t/jp_where_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_where_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #Insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -116,31 +111,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-
 #InnoDB
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 SELECT * FROM `Ｔ２` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
@@ -151,16 +121,11 @@ SELECT * FROM `Ｔ４` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 SELECT * FROM `Ｔ５` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#BDB
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -170,6 +135,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_where_ujis.test b/mysql-test/suite/jp/t/jp_where_ujis.test
index e96404fbb17..ce39e2670da 100644
--- a/mysql-test/suite/jp/t/jp_where_ujis.test
+++ b/mysql-test/suite/jp/t/jp_where_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -28,12 +26,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engi
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -49,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ６`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `Ｔ１２`;
 
 #InnoDB
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
@@ -63,16 +55,11 @@ SELECT * FROM `Ｔ４` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 SELECT * FROM `Ｔ５` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#BDB
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -82,6 +69,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test
index 7280bc33f21..97234ff15c5 100644
--- a/mysql-test/suite/jp/t/jp_where_utf8.test
+++ b/mysql-test/suite/jp/t/jp_where_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
@@ -8,13 +10,10 @@ drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
 drop table if exists `鐚器��`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
-drop table if exists `鐚器��鐚�`;
 --enable_warnings
 
 #
-# Test Displaying Japanese charact using WHERE condtion in utf8 encoding
+# Test Displaying Japanese charact using WHERE condition in utf8 encoding
 #
 
 SET NAMES utf8;
@@ -26,12 +25,9 @@ CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `鐚器��鐚�` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `鐚器��` (`鐚ｏ��` char(20), INDEX(`鐚ｏ��`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 
 #Load the following data in each table
 # jisx0201 hankaku-katakana data
@@ -47,9 +43,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `鐚器��鐚�`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `鐚器��鐚�`;
 
 #InnoDB
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
@@ -61,16 +54,11 @@ SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔�
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '��祉��������������������������������������������������������';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 
-#Heap
+#MEMORY
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '��祉��������������������������������������������������������';
 SELECT * FROM `鐚器��` WHERE `鐚ｏ��` = '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
 
-#BDB
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '��祉��������������������������������������������������������';
-SELECT * FROM `鐚器��鐚�` WHERE `鐚ｏ��` = '藜�藜�藜演鴫藜顔七藜拷失藜守悉藜翠��藹�藹�藹�藹�藹�藹�藹�藹�';
-
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
@@ -80,6 +68,3 @@ DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
 DROP TABLE `鐚器��`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;
-DROP TABLE `鐚器��鐚�`;