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

1 files changed, 40 insertions, 79 deletions

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`;