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, 132 insertions, 267 deletions

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