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, 3 insertions, 2 deletions

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 `龔龖龗`;