Many files:

  Change mode to -rw-rw----


mysql-test/suite/jp/r/jp_alter_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_union_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_sjis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis3.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_union_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_utf8.test:
  Change mode to -rw-rw----

235 files changed, 0 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result
index f970508229a..f970508229a 100755..100644
--- a/mysql-test/suite/jp/r/jp_alter_sjis.result
+++ b/mysql-test/suite/jp/r/jp_alter_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result
index 2756e5a758d..2756e5a758d 100755..100644
--- a/mysql-test/suite/jp/r/jp_alter_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result
index afa3c79cbce..afa3c79cbce 100755..100644
--- a/mysql-test/suite/jp/r/jp_alter_ujis.result
+++ b/mysql-test/suite/jp/r/jp_alter_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result
index 19475e06a87..19475e06a87 100755..100644
--- a/mysql-test/suite/jp/r/jp_alter_utf8.result
+++ b/mysql-test/suite/jp/r/jp_alter_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_charlength_sjis.result b/mysql-test/suite/jp/r/jp_charlength_sjis.result
index 57d538ef8d0..57d538ef8d0 100755..100644
--- a/mysql-test/suite/jp/r/jp_charlength_sjis.result
+++ b/mysql-test/suite/jp/r/jp_charlength_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_charlength_ucs2.result b/mysql-test/suite/jp/r/jp_charlength_ucs2.result
index 3695ee5159a..3695ee5159a 100755..100644
--- a/mysql-test/suite/jp/r/jp_charlength_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_charlength_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_charlength_ujis.result b/mysql-test/suite/jp/r/jp_charlength_ujis.result
index ccfbf4fa3a1..ccfbf4fa3a1 100755..100644
--- a/mysql-test/suite/jp/r/jp_charlength_ujis.result
+++ b/mysql-test/suite/jp/r/jp_charlength_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_charlength_utf8.result b/mysql-test/suite/jp/r/jp_charlength_utf8.result
index d4d7f68f933..d4d7f68f933 100755..100644
--- a/mysql-test/suite/jp/r/jp_charlength_utf8.result
+++ b/mysql-test/suite/jp/r/jp_charlength_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_charset_sjis.result b/mysql-test/suite/jp/r/jp_charset_sjis.result
index 80ef24a7334..80ef24a7334 100755..100644
--- a/mysql-test/suite/jp/r/jp_charset_sjis.result
+++ b/mysql-test/suite/jp/r/jp_charset_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_charset_ucs2.result b/mysql-test/suite/jp/r/jp_charset_ucs2.result
index d121e98fc00..d121e98fc00 100755..100644
--- a/mysql-test/suite/jp/r/jp_charset_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_charset_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result
index 964477896bd..964477896bd 100755..100644
--- a/mysql-test/suite/jp/r/jp_charset_ujis.result
+++ b/mysql-test/suite/jp/r/jp_charset_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_charset_utf8.result b/mysql-test/suite/jp/r/jp_charset_utf8.result
index 2fdd3fb1a6b..2fdd3fb1a6b 100755..100644
--- a/mysql-test/suite/jp/r/jp_charset_utf8.result
+++ b/mysql-test/suite/jp/r/jp_charset_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_convert_sjis.result b/mysql-test/suite/jp/r/jp_convert_sjis.result
index 8c9df3606c8..8c9df3606c8 100755..100644
--- a/mysql-test/suite/jp/r/jp_convert_sjis.result
+++ b/mysql-test/suite/jp/r/jp_convert_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
index 92c2032993e..92c2032993e 100755..100644
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result
index 55f2ab0aea3..55f2ab0aea3 100755..100644
--- a/mysql-test/suite/jp/r/jp_convert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_convert_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index 505d6c1cebf..505d6c1cebf 100755..100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
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..1ce0b7228d5 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result
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..8fd921ea8e6 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
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..45fdb34717b 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result
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..c0e996040de 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result
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..ecc72f9d91b 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
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..0bf5a6891b0 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
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..ae555e5af15 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
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..d4873406c46 100755..100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result
index 1e46dbffbb1..1e46dbffbb1 100755..100644
--- a/mysql-test/suite/jp/r/jp_enum_sjis.result
+++ b/mysql-test/suite/jp/r/jp_enum_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result
index a84cace35fe..a84cace35fe 100755..100644
--- a/mysql-test/suite/jp/r/jp_enum_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result
index dbc850b1368..dbc850b1368 100755..100644
--- a/mysql-test/suite/jp/r/jp_enum_ujis.result
+++ b/mysql-test/suite/jp/r/jp_enum_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
index f2515871ece..f2515871ece 100755..100644
--- a/mysql-test/suite/jp/r/jp_enum_utf8.result
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_insert_sjis.result b/mysql-test/suite/jp/r/jp_insert_sjis.result
index c516986a256..c516986a256 100755..100644
--- a/mysql-test/suite/jp/r/jp_insert_sjis.result
+++ b/mysql-test/suite/jp/r/jp_insert_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_insert_ucs2.result b/mysql-test/suite/jp/r/jp_insert_ucs2.result
index 45487f65138..45487f65138 100755..100644
--- a/mysql-test/suite/jp/r/jp_insert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_insert_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_insert_ujis.result b/mysql-test/suite/jp/r/jp_insert_ujis.result
index 7f42d66c565..7f42d66c565 100755..100644
--- a/mysql-test/suite/jp/r/jp_insert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_insert_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_insert_utf8.result b/mysql-test/suite/jp/r/jp_insert_utf8.result
index 368ba35f637..368ba35f637 100755..100644
--- a/mysql-test/suite/jp/r/jp_insert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_insert_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result
index 9a6dea5a426..9a6dea5a426 100755..100644
--- a/mysql-test/suite/jp/r/jp_instr_sjis.result
+++ b/mysql-test/suite/jp/r/jp_instr_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_instr_ucs2.result b/mysql-test/suite/jp/r/jp_instr_ucs2.result
index 352525eee0b..352525eee0b 100755..100644
--- a/mysql-test/suite/jp/r/jp_instr_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_instr_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_instr_ujis.result b/mysql-test/suite/jp/r/jp_instr_ujis.result
index 0cf9895a740..0cf9895a740 100755..100644
--- a/mysql-test/suite/jp/r/jp_instr_ujis.result
+++ b/mysql-test/suite/jp/r/jp_instr_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_instr_utf8.result b/mysql-test/suite/jp/r/jp_instr_utf8.result
index 0e55227e4b7..0e55227e4b7 100755..100644
--- a/mysql-test/suite/jp/r/jp_instr_utf8.result
+++ b/mysql-test/suite/jp/r/jp_instr_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_join_sjis.result b/mysql-test/suite/jp/r/jp_join_sjis.result
index a5ccc58ae4c..a5ccc58ae4c 100755..100644
--- a/mysql-test/suite/jp/r/jp_join_sjis.result
+++ b/mysql-test/suite/jp/r/jp_join_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_join_ucs2.result b/mysql-test/suite/jp/r/jp_join_ucs2.result
index 76988f15cc4..76988f15cc4 100755..100644
--- a/mysql-test/suite/jp/r/jp_join_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_join_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_join_ujis.result b/mysql-test/suite/jp/r/jp_join_ujis.result
index ac430cd9b5e..ac430cd9b5e 100755..100644
--- a/mysql-test/suite/jp/r/jp_join_ujis.result
+++ b/mysql-test/suite/jp/r/jp_join_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_join_utf8.result b/mysql-test/suite/jp/r/jp_join_utf8.result
index 716e97a2bb3..716e97a2bb3 100755..100644
--- a/mysql-test/suite/jp/r/jp_join_utf8.result
+++ b/mysql-test/suite/jp/r/jp_join_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_left_sjis.result b/mysql-test/suite/jp/r/jp_left_sjis.result
index ae5564186ab..ae5564186ab 100755..100644
--- a/mysql-test/suite/jp/r/jp_left_sjis.result
+++ b/mysql-test/suite/jp/r/jp_left_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_left_ucs2.result b/mysql-test/suite/jp/r/jp_left_ucs2.result
index 349883e9064..349883e9064 100755..100644
--- a/mysql-test/suite/jp/r/jp_left_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_left_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_left_ujis.result b/mysql-test/suite/jp/r/jp_left_ujis.result
index bd3efc67eec..bd3efc67eec 100755..100644
--- a/mysql-test/suite/jp/r/jp_left_ujis.result
+++ b/mysql-test/suite/jp/r/jp_left_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_left_utf8.result b/mysql-test/suite/jp/r/jp_left_utf8.result
index 62cca976fe0..62cca976fe0 100755..100644
--- a/mysql-test/suite/jp/r/jp_left_utf8.result
+++ b/mysql-test/suite/jp/r/jp_left_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_length_sjis.result b/mysql-test/suite/jp/r/jp_length_sjis.result
index 51055e09233..51055e09233 100755..100644
--- a/mysql-test/suite/jp/r/jp_length_sjis.result
+++ b/mysql-test/suite/jp/r/jp_length_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_length_ucs2.result b/mysql-test/suite/jp/r/jp_length_ucs2.result
index 569e012f7d3..569e012f7d3 100755..100644
--- a/mysql-test/suite/jp/r/jp_length_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_length_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_length_ujis.result b/mysql-test/suite/jp/r/jp_length_ujis.result
index 288cc06a2ef..288cc06a2ef 100755..100644
--- a/mysql-test/suite/jp/r/jp_length_ujis.result
+++ b/mysql-test/suite/jp/r/jp_length_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_length_utf8.result b/mysql-test/suite/jp/r/jp_length_utf8.result
index 11b4c523053..11b4c523053 100755..100644
--- a/mysql-test/suite/jp/r/jp_length_utf8.result
+++ b/mysql-test/suite/jp/r/jp_length_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_like_sjis.result b/mysql-test/suite/jp/r/jp_like_sjis.result
index a8145fb08f0..a8145fb08f0 100755..100644
--- a/mysql-test/suite/jp/r/jp_like_sjis.result
+++ b/mysql-test/suite/jp/r/jp_like_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_like_ucs2.result b/mysql-test/suite/jp/r/jp_like_ucs2.result
index 229ef12a118..229ef12a118 100755..100644
--- a/mysql-test/suite/jp/r/jp_like_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_like_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_like_ujis.result b/mysql-test/suite/jp/r/jp_like_ujis.result
index 5d623df0384..5d623df0384 100755..100644
--- a/mysql-test/suite/jp/r/jp_like_ujis.result
+++ b/mysql-test/suite/jp/r/jp_like_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_like_utf8.result b/mysql-test/suite/jp/r/jp_like_utf8.result
index bf48da79951..bf48da79951 100755..100644
--- a/mysql-test/suite/jp/r/jp_like_utf8.result
+++ b/mysql-test/suite/jp/r/jp_like_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_locate_sjis.result b/mysql-test/suite/jp/r/jp_locate_sjis.result
index b2455401db8..b2455401db8 100755..100644
--- a/mysql-test/suite/jp/r/jp_locate_sjis.result
+++ b/mysql-test/suite/jp/r/jp_locate_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_locate_ucs2.result b/mysql-test/suite/jp/r/jp_locate_ucs2.result
index 37b219b3335..37b219b3335 100755..100644
--- a/mysql-test/suite/jp/r/jp_locate_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_locate_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_locate_ujis.result b/mysql-test/suite/jp/r/jp_locate_ujis.result
index d139fa9203c..d139fa9203c 100755..100644
--- a/mysql-test/suite/jp/r/jp_locate_ujis.result
+++ b/mysql-test/suite/jp/r/jp_locate_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_locate_utf8.result b/mysql-test/suite/jp/r/jp_locate_utf8.result
index a1ce9e8d2dc..a1ce9e8d2dc 100755..100644
--- a/mysql-test/suite/jp/r/jp_locate_utf8.result
+++ b/mysql-test/suite/jp/r/jp_locate_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_lpad_sjis.result b/mysql-test/suite/jp/r/jp_lpad_sjis.result
index b45427ebf3d..b45427ebf3d 100755..100644
--- a/mysql-test/suite/jp/r/jp_lpad_sjis.result
+++ b/mysql-test/suite/jp/r/jp_lpad_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_lpad_ucs2.result b/mysql-test/suite/jp/r/jp_lpad_ucs2.result
index 951c5508a8f..951c5508a8f 100755..100644
--- a/mysql-test/suite/jp/r/jp_lpad_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_lpad_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_lpad_ujis.result b/mysql-test/suite/jp/r/jp_lpad_ujis.result
index 945e513d066..945e513d066 100755..100644
--- a/mysql-test/suite/jp/r/jp_lpad_ujis.result
+++ b/mysql-test/suite/jp/r/jp_lpad_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_lpad_utf8.result b/mysql-test/suite/jp/r/jp_lpad_utf8.result
index 8a3bae0153e..8a3bae0153e 100755..100644
--- a/mysql-test/suite/jp/r/jp_lpad_utf8.result
+++ b/mysql-test/suite/jp/r/jp_lpad_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_ltrim_sjis.result b/mysql-test/suite/jp/r/jp_ltrim_sjis.result
index 23032d65c56..23032d65c56 100755..100644
--- a/mysql-test/suite/jp/r/jp_ltrim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
index 533cf95a976..533cf95a976 100755..100644
--- a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_ltrim_ujis.result b/mysql-test/suite/jp/r/jp_ltrim_ujis.result
index 1c95f28907f..1c95f28907f 100755..100644
--- a/mysql-test/suite/jp/r/jp_ltrim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_ltrim_utf8.result b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
index c6fae7233f1..c6fae7233f1 100755..100644
--- a/mysql-test/suite/jp/r/jp_ltrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_ps_sjis.result b/mysql-test/suite/jp/r/jp_ps_sjis.result
index 2397bc78c5b..2397bc78c5b 100755..100644
--- a/mysql-test/suite/jp/r/jp_ps_sjis.result
+++ b/mysql-test/suite/jp/r/jp_ps_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_ps_ujis.result b/mysql-test/suite/jp/r/jp_ps_ujis.result
index 9afef7f76d1..9afef7f76d1 100755..100644
--- a/mysql-test/suite/jp/r/jp_ps_ujis.result
+++ b/mysql-test/suite/jp/r/jp_ps_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_replace_sjis.result b/mysql-test/suite/jp/r/jp_replace_sjis.result
index 08e45968fdd..08e45968fdd 100755..100644
--- a/mysql-test/suite/jp/r/jp_replace_sjis.result
+++ b/mysql-test/suite/jp/r/jp_replace_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_replace_ucs2.result b/mysql-test/suite/jp/r/jp_replace_ucs2.result
index 2911fe69b9a..2911fe69b9a 100755..100644
--- a/mysql-test/suite/jp/r/jp_replace_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_replace_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_replace_ujis.result b/mysql-test/suite/jp/r/jp_replace_ujis.result
index 7f776804ee9..7f776804ee9 100755..100644
--- a/mysql-test/suite/jp/r/jp_replace_ujis.result
+++ b/mysql-test/suite/jp/r/jp_replace_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_replace_utf8.result b/mysql-test/suite/jp/r/jp_replace_utf8.result
index 16981fcd0d8..16981fcd0d8 100755..100644
--- a/mysql-test/suite/jp/r/jp_replace_utf8.result
+++ b/mysql-test/suite/jp/r/jp_replace_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_reverse_sjis.result b/mysql-test/suite/jp/r/jp_reverse_sjis.result
index 76cf9d6b571..76cf9d6b571 100755..100644
--- a/mysql-test/suite/jp/r/jp_reverse_sjis.result
+++ b/mysql-test/suite/jp/r/jp_reverse_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_reverse_ucs2.result b/mysql-test/suite/jp/r/jp_reverse_ucs2.result
index ad9782d5048..ad9782d5048 100755..100644
--- a/mysql-test/suite/jp/r/jp_reverse_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_reverse_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_reverse_ujis.result b/mysql-test/suite/jp/r/jp_reverse_ujis.result
index 888f7f9e054..888f7f9e054 100755..100644
--- a/mysql-test/suite/jp/r/jp_reverse_ujis.result
+++ b/mysql-test/suite/jp/r/jp_reverse_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_reverse_utf8.result b/mysql-test/suite/jp/r/jp_reverse_utf8.result
index 4e02cf69645..4e02cf69645 100755..100644
--- a/mysql-test/suite/jp/r/jp_reverse_utf8.result
+++ b/mysql-test/suite/jp/r/jp_reverse_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_right_sjis.result b/mysql-test/suite/jp/r/jp_right_sjis.result
index 249d7bbb0bc..249d7bbb0bc 100755..100644
--- a/mysql-test/suite/jp/r/jp_right_sjis.result
+++ b/mysql-test/suite/jp/r/jp_right_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_right_ucs2.result b/mysql-test/suite/jp/r/jp_right_ucs2.result
index a8a3fba0f92..a8a3fba0f92 100755..100644
--- a/mysql-test/suite/jp/r/jp_right_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_right_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_right_ujis.result b/mysql-test/suite/jp/r/jp_right_ujis.result
index bb182853d95..bb182853d95 100755..100644
--- a/mysql-test/suite/jp/r/jp_right_ujis.result
+++ b/mysql-test/suite/jp/r/jp_right_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_right_utf8.result b/mysql-test/suite/jp/r/jp_right_utf8.result
index 50ba18ce3c4..50ba18ce3c4 100755..100644
--- a/mysql-test/suite/jp/r/jp_right_utf8.result
+++ b/mysql-test/suite/jp/r/jp_right_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_rpad_sjis.result b/mysql-test/suite/jp/r/jp_rpad_sjis.result
index 9c61c200672..9c61c200672 100755..100644
--- a/mysql-test/suite/jp/r/jp_rpad_sjis.result
+++ b/mysql-test/suite/jp/r/jp_rpad_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_rpad_ucs2.result b/mysql-test/suite/jp/r/jp_rpad_ucs2.result
index b9df4cf6783..b9df4cf6783 100755..100644
--- a/mysql-test/suite/jp/r/jp_rpad_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_rpad_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_rpad_ujis.result b/mysql-test/suite/jp/r/jp_rpad_ujis.result
index 3183b4f5fcd..3183b4f5fcd 100755..100644
--- a/mysql-test/suite/jp/r/jp_rpad_ujis.result
+++ b/mysql-test/suite/jp/r/jp_rpad_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_rpad_utf8.result b/mysql-test/suite/jp/r/jp_rpad_utf8.result
index c482a058bd8..c482a058bd8 100755..100644
--- a/mysql-test/suite/jp/r/jp_rpad_utf8.result
+++ b/mysql-test/suite/jp/r/jp_rpad_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_rtrim_sjis.result b/mysql-test/suite/jp/r/jp_rtrim_sjis.result
index 01ab173c982..01ab173c982 100755..100644
--- a/mysql-test/suite/jp/r/jp_rtrim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
index 905f5bef08f..905f5bef08f 100755..100644
--- a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_rtrim_ujis.result b/mysql-test/suite/jp/r/jp_rtrim_ujis.result
index 84b141c16dc..84b141c16dc 100755..100644
--- a/mysql-test/suite/jp/r/jp_rtrim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_rtrim_utf8.result b/mysql-test/suite/jp/r/jp_rtrim_utf8.result
index 09d719f3386..09d719f3386 100755..100644
--- a/mysql-test/suite/jp/r/jp_rtrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_select_sjis.result b/mysql-test/suite/jp/r/jp_select_sjis.result
index d48d08d745f..d48d08d745f 100755..100644
--- a/mysql-test/suite/jp/r/jp_select_sjis.result
+++ b/mysql-test/suite/jp/r/jp_select_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_select_ucs2.result b/mysql-test/suite/jp/r/jp_select_ucs2.result
index 39d057ed107..39d057ed107 100755..100644
--- a/mysql-test/suite/jp/r/jp_select_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_select_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_select_ujis.result b/mysql-test/suite/jp/r/jp_select_ujis.result
index 3eea73c8083..3eea73c8083 100755..100644
--- a/mysql-test/suite/jp/r/jp_select_ujis.result
+++ b/mysql-test/suite/jp/r/jp_select_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_select_utf8.result b/mysql-test/suite/jp/r/jp_select_utf8.result
index 43704ad2f6e..43704ad2f6e 100755..100644
--- a/mysql-test/suite/jp/r/jp_select_utf8.result
+++ b/mysql-test/suite/jp/r/jp_select_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_subquery_sjis.result b/mysql-test/suite/jp/r/jp_subquery_sjis.result
index b94de3630af..b94de3630af 100755..100644
--- a/mysql-test/suite/jp/r/jp_subquery_sjis.result
+++ b/mysql-test/suite/jp/r/jp_subquery_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_subquery_ucs2.result b/mysql-test/suite/jp/r/jp_subquery_ucs2.result
index 023100ecce3..023100ecce3 100755..100644
--- a/mysql-test/suite/jp/r/jp_subquery_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_subquery_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_subquery_ujis.result b/mysql-test/suite/jp/r/jp_subquery_ujis.result
index 0b6aa03970f..0b6aa03970f 100755..100644
--- a/mysql-test/suite/jp/r/jp_subquery_ujis.result
+++ b/mysql-test/suite/jp/r/jp_subquery_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_subquery_utf8.result b/mysql-test/suite/jp/r/jp_subquery_utf8.result
index ce56e660a65..ce56e660a65 100755..100644
--- a/mysql-test/suite/jp/r/jp_subquery_utf8.result
+++ b/mysql-test/suite/jp/r/jp_subquery_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_substring_sjis.result b/mysql-test/suite/jp/r/jp_substring_sjis.result
index 3fe5bf44b86..3fe5bf44b86 100755..100644
--- a/mysql-test/suite/jp/r/jp_substring_sjis.result
+++ b/mysql-test/suite/jp/r/jp_substring_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_substring_ucs2.result b/mysql-test/suite/jp/r/jp_substring_ucs2.result
index cb2a5b5b946..cb2a5b5b946 100755..100644
--- a/mysql-test/suite/jp/r/jp_substring_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_substring_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_substring_ujis.result b/mysql-test/suite/jp/r/jp_substring_ujis.result
index 229de0c0236..229de0c0236 100755..100644
--- a/mysql-test/suite/jp/r/jp_substring_ujis.result
+++ b/mysql-test/suite/jp/r/jp_substring_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_substring_utf8.result b/mysql-test/suite/jp/r/jp_substring_utf8.result
index f838a2e75e2..f838a2e75e2 100755..100644
--- a/mysql-test/suite/jp/r/jp_substring_utf8.result
+++ b/mysql-test/suite/jp/r/jp_substring_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_trim_sjis.result b/mysql-test/suite/jp/r/jp_trim_sjis.result
index e6ab86fd20a..e6ab86fd20a 100755..100644
--- a/mysql-test/suite/jp/r/jp_trim_sjis.result
+++ b/mysql-test/suite/jp/r/jp_trim_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_trim_ucs2.result b/mysql-test/suite/jp/r/jp_trim_ucs2.result
index 6ef73301a49..6ef73301a49 100755..100644
--- a/mysql-test/suite/jp/r/jp_trim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_trim_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_trim_ujis.result b/mysql-test/suite/jp/r/jp_trim_ujis.result
index b79a1b24a37..b79a1b24a37 100755..100644
--- a/mysql-test/suite/jp/r/jp_trim_ujis.result
+++ b/mysql-test/suite/jp/r/jp_trim_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_trim_utf8.result b/mysql-test/suite/jp/r/jp_trim_utf8.result
index 99fb785e495..99fb785e495 100755..100644
--- a/mysql-test/suite/jp/r/jp_trim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_trim_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_union_ujis.result b/mysql-test/suite/jp/r/jp_union_ujis.result
index 4b74c570ffe..4b74c570ffe 100755..100644
--- a/mysql-test/suite/jp/r/jp_union_ujis.result
+++ b/mysql-test/suite/jp/r/jp_union_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_update_sjis.result b/mysql-test/suite/jp/r/jp_update_sjis.result
index 65151cc7021..65151cc7021 100755..100644
--- a/mysql-test/suite/jp/r/jp_update_sjis.result
+++ b/mysql-test/suite/jp/r/jp_update_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_update_ucs2.result b/mysql-test/suite/jp/r/jp_update_ucs2.result
index 2796958ac3e..2796958ac3e 100755..100644
--- a/mysql-test/suite/jp/r/jp_update_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_update_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_update_ujis.result b/mysql-test/suite/jp/r/jp_update_ujis.result
index e9633d14f0c..e9633d14f0c 100755..100644
--- a/mysql-test/suite/jp/r/jp_update_ujis.result
+++ b/mysql-test/suite/jp/r/jp_update_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_update_utf8.result b/mysql-test/suite/jp/r/jp_update_utf8.result
index f690d2f0247..f690d2f0247 100755..100644
--- a/mysql-test/suite/jp/r/jp_update_utf8.result
+++ b/mysql-test/suite/jp/r/jp_update_utf8.result
diff --git a/mysql-test/suite/jp/r/jp_where_sjis.result b/mysql-test/suite/jp/r/jp_where_sjis.result
index a3cbc24c113..a3cbc24c113 100755..100644
--- a/mysql-test/suite/jp/r/jp_where_sjis.result
+++ b/mysql-test/suite/jp/r/jp_where_sjis.result
diff --git a/mysql-test/suite/jp/r/jp_where_ucs2.result b/mysql-test/suite/jp/r/jp_where_ucs2.result
index a05b1da9b68..a05b1da9b68 100755..100644
--- a/mysql-test/suite/jp/r/jp_where_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_where_ucs2.result
diff --git a/mysql-test/suite/jp/r/jp_where_ujis.result b/mysql-test/suite/jp/r/jp_where_ujis.result
index b13b8a10ef8..b13b8a10ef8 100755..100644
--- a/mysql-test/suite/jp/r/jp_where_ujis.result
+++ b/mysql-test/suite/jp/r/jp_where_ujis.result
diff --git a/mysql-test/suite/jp/r/jp_where_utf8.result b/mysql-test/suite/jp/r/jp_where_utf8.result
index d69aaf8715d..d69aaf8715d 100755..100644
--- a/mysql-test/suite/jp/r/jp_where_utf8.result
+++ b/mysql-test/suite/jp/r/jp_where_utf8.result
diff --git a/mysql-test/suite/jp/std_data/jisx0201_sjis.dat b/mysql-test/suite/jp/std_data/jisx0201_sjis.dat
index 7556c4d3085..7556c4d3085 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0201_sjis.dat
+++ b/mysql-test/suite/jp/std_data/jisx0201_sjis.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat b/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
index 777f956a6cf..777f956a6cf 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0201_ujis.dat b/mysql-test/suite/jp/std_data/jisx0201_ujis.dat
index 07169ec8ab2..07169ec8ab2 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0201_ujis.dat
+++ b/mysql-test/suite/jp/std_data/jisx0201_ujis.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0201_utf8.dat b/mysql-test/suite/jp/std_data/jisx0201_utf8.dat
index 3052e4fcc8b..3052e4fcc8b 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0201_utf8.dat
+++ b/mysql-test/suite/jp/std_data/jisx0201_utf8.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_sjis.dat b/mysql-test/suite/jp/std_data/jisx0208_sjis.dat
index 767be2090ac..767be2090ac 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
index d731cc0e3b2..d731cc0e3b2 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat b/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat
index b636aacdb62..b636aacdb62 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat b/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat
index 3ac15368c05..3ac15368c05 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_ujis.dat b/mysql-test/suite/jp/std_data/jisx0208_ujis.dat
index 6076ade4245..6076ade4245 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_ujis.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_ujis.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_utf8.dat b/mysql-test/suite/jp/std_data/jisx0208_utf8.dat
index 4ab29099a60..4ab29099a60 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0208_utf8.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_utf8.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat b/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat
index 001c9589910..001c9589910 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0212_ujis.dat b/mysql-test/suite/jp/std_data/jisx0212_ujis.dat
index 40c8645825b..40c8645825b 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0212_ujis.dat
+++ b/mysql-test/suite/jp/std_data/jisx0212_ujis.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0212_utf8.dat b/mysql-test/suite/jp/std_data/jisx0212_utf8.dat
index 3f9354255d0..3f9354255d0 100755..100644
--- a/mysql-test/suite/jp/std_data/jisx0212_utf8.dat
+++ b/mysql-test/suite/jp/std_data/jisx0212_utf8.dat
diff --git a/mysql-test/suite/jp/t/jp_alter_sjis.test b/mysql-test/suite/jp/t/jp_alter_sjis.test
index b7b31862599..b7b31862599 100755..100644
--- a/mysql-test/suite/jp/t/jp_alter_sjis.test
+++ b/mysql-test/suite/jp/t/jp_alter_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_alter_ucs2.test b/mysql-test/suite/jp/t/jp_alter_ucs2.test
index 6c5b3132edf..6c5b3132edf 100755..100644
--- a/mysql-test/suite/jp/t/jp_alter_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_alter_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test
index d388d20c49b..d388d20c49b 100755..100644
--- a/mysql-test/suite/jp/t/jp_alter_ujis.test
+++ b/mysql-test/suite/jp/t/jp_alter_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_alter_utf8.test b/mysql-test/suite/jp/t/jp_alter_utf8.test
index 6771343f38f..6771343f38f 100755..100644
--- a/mysql-test/suite/jp/t/jp_alter_utf8.test
+++ b/mysql-test/suite/jp/t/jp_alter_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_charlength_sjis.test b/mysql-test/suite/jp/t/jp_charlength_sjis.test
index 5f3543bb7a6..5f3543bb7a6 100755..100644
--- a/mysql-test/suite/jp/t/jp_charlength_sjis.test
+++ b/mysql-test/suite/jp/t/jp_charlength_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_charlength_ucs2.test b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
index 2db9db7cfc6..2db9db7cfc6 100755..100644
--- a/mysql-test/suite/jp/t/jp_charlength_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_charlength_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_charlength_ujis.test b/mysql-test/suite/jp/t/jp_charlength_ujis.test
index 08973231f27..08973231f27 100755..100644
--- a/mysql-test/suite/jp/t/jp_charlength_ujis.test
+++ b/mysql-test/suite/jp/t/jp_charlength_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_charlength_utf8.test b/mysql-test/suite/jp/t/jp_charlength_utf8.test
index a3f74db27ee..a3f74db27ee 100755..100644
--- a/mysql-test/suite/jp/t/jp_charlength_utf8.test
+++ b/mysql-test/suite/jp/t/jp_charlength_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test
index 3a9f264bdfe..3a9f264bdfe 100755..100644
--- a/mysql-test/suite/jp/t/jp_charset_sjis.test
+++ b/mysql-test/suite/jp/t/jp_charset_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test
index 5183071033b..5183071033b 100755..100644
--- a/mysql-test/suite/jp/t/jp_charset_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_charset_ujis.test b/mysql-test/suite/jp/t/jp_charset_ujis.test
index de9ef318530..de9ef318530 100755..100644
--- a/mysql-test/suite/jp/t/jp_charset_ujis.test
+++ b/mysql-test/suite/jp/t/jp_charset_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_charset_utf8.test b/mysql-test/suite/jp/t/jp_charset_utf8.test
index 2d73daba42a..2d73daba42a 100755..100644
--- a/mysql-test/suite/jp/t/jp_charset_utf8.test
+++ b/mysql-test/suite/jp/t/jp_charset_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test
index 93fa33029bf..93fa33029bf 100755..100644
--- a/mysql-test/suite/jp/t/jp_convert_sjis.test
+++ b/mysql-test/suite/jp/t/jp_convert_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test
index 88b0d0c9cba..88b0d0c9cba 100755..100644
--- a/mysql-test/suite/jp/t/jp_convert_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_convert_ujis.test b/mysql-test/suite/jp/t/jp_convert_ujis.test
index d6303b66f34..d6303b66f34 100755..100644
--- a/mysql-test/suite/jp/t/jp_convert_ujis.test
+++ b/mysql-test/suite/jp/t/jp_convert_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test
index a687b0f06cb..a687b0f06cb 100755..100644
--- a/mysql-test/suite/jp/t/jp_convert_utf8.test
+++ b/mysql-test/suite/jp/t/jp_convert_utf8.test
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..ef66d338fce 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_db_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_create_db_ucs2.test b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
index 9e8ca7d2a0f..9e8ca7d2a0f 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_db_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_create_db_ujis.test b/mysql-test/suite/jp/t/jp_create_db_ujis.test
index 0095f864836..0095f864836 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_db_ujis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ujis.test
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..4f8eb24cbe3 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_db_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
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..45c0b24388b 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
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..519697e3530 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
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..ac70facdce9 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
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..5c816eb169a 100755..100644
--- a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_enum_sjis.test b/mysql-test/suite/jp/t/jp_enum_sjis.test
index 2ea1bf320e0..2ea1bf320e0 100755..100644
--- a/mysql-test/suite/jp/t/jp_enum_sjis.test
+++ b/mysql-test/suite/jp/t/jp_enum_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2.test b/mysql-test/suite/jp/t/jp_enum_ucs2.test
index 2239ebab478..2239ebab478 100755..100644
--- a/mysql-test/suite/jp/t/jp_enum_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_enum_ujis.test b/mysql-test/suite/jp/t/jp_enum_ujis.test
index da41165aad0..da41165aad0 100755..100644
--- a/mysql-test/suite/jp/t/jp_enum_ujis.test
+++ b/mysql-test/suite/jp/t/jp_enum_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test
index 4ce3576b604..4ce3576b604 100755..100644
--- a/mysql-test/suite/jp/t/jp_enum_utf8.test
+++ b/mysql-test/suite/jp/t/jp_enum_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_insert_sjis.test b/mysql-test/suite/jp/t/jp_insert_sjis.test
index 0266ad1eaca..0266ad1eaca 100755..100644
--- a/mysql-test/suite/jp/t/jp_insert_sjis.test
+++ b/mysql-test/suite/jp/t/jp_insert_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_insert_ucs2.test b/mysql-test/suite/jp/t/jp_insert_ucs2.test
index 9b0a02e57d8..9b0a02e57d8 100755..100644
--- a/mysql-test/suite/jp/t/jp_insert_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_insert_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_insert_ujis.test b/mysql-test/suite/jp/t/jp_insert_ujis.test
index 7b6d2838386..7b6d2838386 100755..100644
--- a/mysql-test/suite/jp/t/jp_insert_ujis.test
+++ b/mysql-test/suite/jp/t/jp_insert_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_insert_utf8.test b/mysql-test/suite/jp/t/jp_insert_utf8.test
index ef6acb90063..ef6acb90063 100755..100644
--- a/mysql-test/suite/jp/t/jp_insert_utf8.test
+++ b/mysql-test/suite/jp/t/jp_insert_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_instr_sjis.test b/mysql-test/suite/jp/t/jp_instr_sjis.test
index c19b5f2b14c..c19b5f2b14c 100755..100644
--- a/mysql-test/suite/jp/t/jp_instr_sjis.test
+++ b/mysql-test/suite/jp/t/jp_instr_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test
index b8f83961e90..b8f83961e90 100755..100644
--- a/mysql-test/suite/jp/t/jp_instr_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_instr_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_instr_ujis.test b/mysql-test/suite/jp/t/jp_instr_ujis.test
index 696e1147372..696e1147372 100755..100644
--- a/mysql-test/suite/jp/t/jp_instr_ujis.test
+++ b/mysql-test/suite/jp/t/jp_instr_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test
index b25b72bc8d0..b25b72bc8d0 100755..100644
--- a/mysql-test/suite/jp/t/jp_instr_utf8.test
+++ b/mysql-test/suite/jp/t/jp_instr_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test
index 30b23913929..30b23913929 100755..100644
--- a/mysql-test/suite/jp/t/jp_join_sjis.test
+++ b/mysql-test/suite/jp/t/jp_join_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test
index 27e49203dd2..27e49203dd2 100755..100644
--- a/mysql-test/suite/jp/t/jp_join_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_join_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_join_ujis.test b/mysql-test/suite/jp/t/jp_join_ujis.test
index 079f260cc26..079f260cc26 100755..100644
--- a/mysql-test/suite/jp/t/jp_join_ujis.test
+++ b/mysql-test/suite/jp/t/jp_join_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_join_utf8.test b/mysql-test/suite/jp/t/jp_join_utf8.test
index 0b2f033f8bb..0b2f033f8bb 100755..100644
--- a/mysql-test/suite/jp/t/jp_join_utf8.test
+++ b/mysql-test/suite/jp/t/jp_join_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_left_sjis.test b/mysql-test/suite/jp/t/jp_left_sjis.test
index 5d69d9892e2..5d69d9892e2 100755..100644
--- a/mysql-test/suite/jp/t/jp_left_sjis.test
+++ b/mysql-test/suite/jp/t/jp_left_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_left_ucs2.test b/mysql-test/suite/jp/t/jp_left_ucs2.test
index 59d10b7d736..59d10b7d736 100755..100644
--- a/mysql-test/suite/jp/t/jp_left_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_left_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_left_ujis.test b/mysql-test/suite/jp/t/jp_left_ujis.test
index 718639cd8a4..718639cd8a4 100755..100644
--- a/mysql-test/suite/jp/t/jp_left_ujis.test
+++ b/mysql-test/suite/jp/t/jp_left_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_left_utf8.test b/mysql-test/suite/jp/t/jp_left_utf8.test
index f9c99718e0f..f9c99718e0f 100755..100644
--- a/mysql-test/suite/jp/t/jp_left_utf8.test
+++ b/mysql-test/suite/jp/t/jp_left_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_length_sjis.test b/mysql-test/suite/jp/t/jp_length_sjis.test
index 7023891b7f0..7023891b7f0 100755..100644
--- a/mysql-test/suite/jp/t/jp_length_sjis.test
+++ b/mysql-test/suite/jp/t/jp_length_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_length_ucs2.test b/mysql-test/suite/jp/t/jp_length_ucs2.test
index 9951c9b6cd1..9951c9b6cd1 100755..100644
--- a/mysql-test/suite/jp/t/jp_length_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_length_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_length_ujis.test b/mysql-test/suite/jp/t/jp_length_ujis.test
index ac3aef2c768..ac3aef2c768 100755..100644
--- a/mysql-test/suite/jp/t/jp_length_ujis.test
+++ b/mysql-test/suite/jp/t/jp_length_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_length_utf8.test b/mysql-test/suite/jp/t/jp_length_utf8.test
index 5c5021f37be..5c5021f37be 100755..100644
--- a/mysql-test/suite/jp/t/jp_length_utf8.test
+++ b/mysql-test/suite/jp/t/jp_length_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_like_sjis.test b/mysql-test/suite/jp/t/jp_like_sjis.test
index 5c41b9ff7ef..5c41b9ff7ef 100755..100644
--- a/mysql-test/suite/jp/t/jp_like_sjis.test
+++ b/mysql-test/suite/jp/t/jp_like_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test
index feae40de49e..feae40de49e 100755..100644
--- a/mysql-test/suite/jp/t/jp_like_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_like_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_like_ujis.test b/mysql-test/suite/jp/t/jp_like_ujis.test
index 29ef7c5d48b..29ef7c5d48b 100755..100644
--- a/mysql-test/suite/jp/t/jp_like_ujis.test
+++ b/mysql-test/suite/jp/t/jp_like_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test
index 4247242029d..4247242029d 100755..100644
--- a/mysql-test/suite/jp/t/jp_like_utf8.test
+++ b/mysql-test/suite/jp/t/jp_like_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_locate_sjis.test b/mysql-test/suite/jp/t/jp_locate_sjis.test
index 92c671199b6..92c671199b6 100755..100644
--- a/mysql-test/suite/jp/t/jp_locate_sjis.test
+++ b/mysql-test/suite/jp/t/jp_locate_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_locate_ucs2.test b/mysql-test/suite/jp/t/jp_locate_ucs2.test
index d00ad67235a..d00ad67235a 100755..100644
--- a/mysql-test/suite/jp/t/jp_locate_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_locate_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_locate_ujis.test b/mysql-test/suite/jp/t/jp_locate_ujis.test
index 5375fad75db..5375fad75db 100755..100644
--- a/mysql-test/suite/jp/t/jp_locate_ujis.test
+++ b/mysql-test/suite/jp/t/jp_locate_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test
index cbf6714e322..cbf6714e322 100755..100644
--- a/mysql-test/suite/jp/t/jp_locate_utf8.test
+++ b/mysql-test/suite/jp/t/jp_locate_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_lpad_sjis.test b/mysql-test/suite/jp/t/jp_lpad_sjis.test
index 7038112cbc8..7038112cbc8 100755..100644
--- a/mysql-test/suite/jp/t/jp_lpad_sjis.test
+++ b/mysql-test/suite/jp/t/jp_lpad_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_lpad_ucs2.test b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
index e3bead0855a..e3bead0855a 100755..100644
--- a/mysql-test/suite/jp/t/jp_lpad_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_lpad_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_lpad_ujis.test b/mysql-test/suite/jp/t/jp_lpad_ujis.test
index eea4877ec3a..eea4877ec3a 100755..100644
--- a/mysql-test/suite/jp/t/jp_lpad_ujis.test
+++ b/mysql-test/suite/jp/t/jp_lpad_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_lpad_utf8.test b/mysql-test/suite/jp/t/jp_lpad_utf8.test
index 599bf5eba28..599bf5eba28 100755..100644
--- a/mysql-test/suite/jp/t/jp_lpad_utf8.test
+++ b/mysql-test/suite/jp/t/jp_lpad_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_ltrim_sjis.test b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
index 864238df07c..864238df07c 100755..100644
--- a/mysql-test/suite/jp/t/jp_ltrim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
index 0ae647f5222..0ae647f5222 100755..100644
--- a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ujis.test b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
index 64363aa330b..64363aa330b 100755..100644
--- a/mysql-test/suite/jp/t/jp_ltrim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
index 846ce11163b..846ce11163b 100755..100644
--- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test
index cc93dca2a79..cc93dca2a79 100755..100644
--- a/mysql-test/suite/jp/t/jp_ps_sjis.test
+++ b/mysql-test/suite/jp/t/jp_ps_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_ps_ujis.test b/mysql-test/suite/jp/t/jp_ps_ujis.test
index 7d61c12e496..7d61c12e496 100755..100644
--- a/mysql-test/suite/jp/t/jp_ps_ujis.test
+++ b/mysql-test/suite/jp/t/jp_ps_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_replace_sjis.test b/mysql-test/suite/jp/t/jp_replace_sjis.test
index 811d3350a34..811d3350a34 100755..100644
--- a/mysql-test/suite/jp/t/jp_replace_sjis.test
+++ b/mysql-test/suite/jp/t/jp_replace_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_replace_ucs2.test b/mysql-test/suite/jp/t/jp_replace_ucs2.test
index 7739a30cd9c..7739a30cd9c 100755..100644
--- a/mysql-test/suite/jp/t/jp_replace_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_replace_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_replace_ujis.test b/mysql-test/suite/jp/t/jp_replace_ujis.test
index 3d8724e63d5..3d8724e63d5 100755..100644
--- a/mysql-test/suite/jp/t/jp_replace_ujis.test
+++ b/mysql-test/suite/jp/t/jp_replace_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_replace_utf8.test b/mysql-test/suite/jp/t/jp_replace_utf8.test
index 1d89a43648b..1d89a43648b 100755..100644
--- a/mysql-test/suite/jp/t/jp_replace_utf8.test
+++ b/mysql-test/suite/jp/t/jp_replace_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_reverse_sjis.test b/mysql-test/suite/jp/t/jp_reverse_sjis.test
index c1e2b2a17ca..c1e2b2a17ca 100755..100644
--- a/mysql-test/suite/jp/t/jp_reverse_sjis.test
+++ b/mysql-test/suite/jp/t/jp_reverse_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_reverse_ucs2.test b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
index d91ec7f70e8..d91ec7f70e8 100755..100644
--- a/mysql-test/suite/jp/t/jp_reverse_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_reverse_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_reverse_ujis.test b/mysql-test/suite/jp/t/jp_reverse_ujis.test
index d37d363f59a..d37d363f59a 100755..100644
--- a/mysql-test/suite/jp/t/jp_reverse_ujis.test
+++ b/mysql-test/suite/jp/t/jp_reverse_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_reverse_utf8.test b/mysql-test/suite/jp/t/jp_reverse_utf8.test
index 4e53d4be049..4e53d4be049 100755..100644
--- a/mysql-test/suite/jp/t/jp_reverse_utf8.test
+++ b/mysql-test/suite/jp/t/jp_reverse_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_right_sjis.test b/mysql-test/suite/jp/t/jp_right_sjis.test
index f481ec532ec..f481ec532ec 100755..100644
--- a/mysql-test/suite/jp/t/jp_right_sjis.test
+++ b/mysql-test/suite/jp/t/jp_right_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_right_ucs2.test b/mysql-test/suite/jp/t/jp_right_ucs2.test
index 23ca2fa4fae..23ca2fa4fae 100755..100644
--- a/mysql-test/suite/jp/t/jp_right_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_right_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test
index b5284489c7e..b5284489c7e 100755..100644
--- a/mysql-test/suite/jp/t/jp_right_ujis.test
+++ b/mysql-test/suite/jp/t/jp_right_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_right_utf8.test b/mysql-test/suite/jp/t/jp_right_utf8.test
index 863755c1dcf..863755c1dcf 100755..100644
--- a/mysql-test/suite/jp/t/jp_right_utf8.test
+++ b/mysql-test/suite/jp/t/jp_right_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_rpad_sjis.test b/mysql-test/suite/jp/t/jp_rpad_sjis.test
index cc008631548..cc008631548 100755..100644
--- a/mysql-test/suite/jp/t/jp_rpad_sjis.test
+++ b/mysql-test/suite/jp/t/jp_rpad_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_rpad_ucs2.test b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
index ca5059497d3..ca5059497d3 100755..100644
--- a/mysql-test/suite/jp/t/jp_rpad_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_rpad_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_rpad_ujis.test b/mysql-test/suite/jp/t/jp_rpad_ujis.test
index d7725b80af7..d7725b80af7 100755..100644
--- a/mysql-test/suite/jp/t/jp_rpad_ujis.test
+++ b/mysql-test/suite/jp/t/jp_rpad_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_rpad_utf8.test b/mysql-test/suite/jp/t/jp_rpad_utf8.test
index b5a335bc6ce..b5a335bc6ce 100755..100644
--- a/mysql-test/suite/jp/t/jp_rpad_utf8.test
+++ b/mysql-test/suite/jp/t/jp_rpad_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_rtrim_sjis.test b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
index c80cf9410f9..c80cf9410f9 100755..100644
--- a/mysql-test/suite/jp/t/jp_rtrim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
index 0fac38d12d1..0fac38d12d1 100755..100644
--- a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_rtrim_ujis.test b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
index 46cda84dd55..46cda84dd55 100755..100644
--- a/mysql-test/suite/jp/t/jp_rtrim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_rtrim_utf8.test b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
index 4880a42db3e..4880a42db3e 100755..100644
--- a/mysql-test/suite/jp/t/jp_rtrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_select_sjis.test b/mysql-test/suite/jp/t/jp_select_sjis.test
index d84ed7a4b2c..d84ed7a4b2c 100755..100644
--- a/mysql-test/suite/jp/t/jp_select_sjis.test
+++ b/mysql-test/suite/jp/t/jp_select_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test
index 2e4602e7ea4..2e4602e7ea4 100755..100644
--- a/mysql-test/suite/jp/t/jp_select_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_select_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_select_ujis.test b/mysql-test/suite/jp/t/jp_select_ujis.test
index 4ad9e581a92..4ad9e581a92 100755..100644
--- a/mysql-test/suite/jp/t/jp_select_ujis.test
+++ b/mysql-test/suite/jp/t/jp_select_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test
index e614b9ccfb0..e614b9ccfb0 100755..100644
--- a/mysql-test/suite/jp/t/jp_select_utf8.test
+++ b/mysql-test/suite/jp/t/jp_select_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_subquery_sjis.test b/mysql-test/suite/jp/t/jp_subquery_sjis.test
index 5292c7a2519..5292c7a2519 100755..100644
--- a/mysql-test/suite/jp/t/jp_subquery_sjis.test
+++ b/mysql-test/suite/jp/t/jp_subquery_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_subquery_ucs2.test b/mysql-test/suite/jp/t/jp_subquery_ucs2.test
index 311433438f4..311433438f4 100755..100644
--- a/mysql-test/suite/jp/t/jp_subquery_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_subquery_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_subquery_ujis.test b/mysql-test/suite/jp/t/jp_subquery_ujis.test
index 67c9f00fd85..67c9f00fd85 100755..100644
--- a/mysql-test/suite/jp/t/jp_subquery_ujis.test
+++ b/mysql-test/suite/jp/t/jp_subquery_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_subquery_utf8.test b/mysql-test/suite/jp/t/jp_subquery_utf8.test
index 97c2df8ce30..97c2df8ce30 100755..100644
--- a/mysql-test/suite/jp/t/jp_subquery_utf8.test
+++ b/mysql-test/suite/jp/t/jp_subquery_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_substring_sjis.test b/mysql-test/suite/jp/t/jp_substring_sjis.test
index ac929114880..ac929114880 100755..100644
--- a/mysql-test/suite/jp/t/jp_substring_sjis.test
+++ b/mysql-test/suite/jp/t/jp_substring_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test
index f3cd5550072..f3cd5550072 100755..100644
--- a/mysql-test/suite/jp/t/jp_substring_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_substring_ujis.test b/mysql-test/suite/jp/t/jp_substring_ujis.test
index c201c7148da..c201c7148da 100755..100644
--- a/mysql-test/suite/jp/t/jp_substring_ujis.test
+++ b/mysql-test/suite/jp/t/jp_substring_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_substring_utf8.test b/mysql-test/suite/jp/t/jp_substring_utf8.test
index 9f88115c899..9f88115c899 100755..100644
--- a/mysql-test/suite/jp/t/jp_substring_utf8.test
+++ b/mysql-test/suite/jp/t/jp_substring_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_trim_sjis.test b/mysql-test/suite/jp/t/jp_trim_sjis.test
index 0f6821605ed..0f6821605ed 100755..100644
--- a/mysql-test/suite/jp/t/jp_trim_sjis.test
+++ b/mysql-test/suite/jp/t/jp_trim_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_trim_ucs2.test b/mysql-test/suite/jp/t/jp_trim_ucs2.test
index 1d8a12650e0..1d8a12650e0 100755..100644
--- a/mysql-test/suite/jp/t/jp_trim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_trim_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_trim_ujis.test b/mysql-test/suite/jp/t/jp_trim_ujis.test
index de401217fcf..de401217fcf 100755..100644
--- a/mysql-test/suite/jp/t/jp_trim_ujis.test
+++ b/mysql-test/suite/jp/t/jp_trim_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_trim_utf8.test b/mysql-test/suite/jp/t/jp_trim_utf8.test
index 0777de15c36..0777de15c36 100755..100644
--- a/mysql-test/suite/jp/t/jp_trim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_trim_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test
index e36d18c85c0..e36d18c85c0 100755..100644
--- a/mysql-test/suite/jp/t/jp_union_ujis.test
+++ b/mysql-test/suite/jp/t/jp_union_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_update_sjis.test b/mysql-test/suite/jp/t/jp_update_sjis.test
index 0dc7372ae92..0dc7372ae92 100755..100644
--- a/mysql-test/suite/jp/t/jp_update_sjis.test
+++ b/mysql-test/suite/jp/t/jp_update_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test
index 7a3c1233210..7a3c1233210 100755..100644
--- a/mysql-test/suite/jp/t/jp_update_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_update_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_update_ujis.test b/mysql-test/suite/jp/t/jp_update_ujis.test
index 852e45b9eeb..852e45b9eeb 100755..100644
--- a/mysql-test/suite/jp/t/jp_update_ujis.test
+++ b/mysql-test/suite/jp/t/jp_update_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_update_utf8.test b/mysql-test/suite/jp/t/jp_update_utf8.test
index b4b3d18ecab..b4b3d18ecab 100755..100644
--- a/mysql-test/suite/jp/t/jp_update_utf8.test
+++ b/mysql-test/suite/jp/t/jp_update_utf8.test
diff --git a/mysql-test/suite/jp/t/jp_where_sjis.test b/mysql-test/suite/jp/t/jp_where_sjis.test
index 452d137f643..452d137f643 100755..100644
--- a/mysql-test/suite/jp/t/jp_where_sjis.test
+++ b/mysql-test/suite/jp/t/jp_where_sjis.test
diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test
index 3b82eacd615..3b82eacd615 100755..100644
--- a/mysql-test/suite/jp/t/jp_where_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_where_ucs2.test
diff --git a/mysql-test/suite/jp/t/jp_where_ujis.test b/mysql-test/suite/jp/t/jp_where_ujis.test
index e96404fbb17..e96404fbb17 100755..100644
--- a/mysql-test/suite/jp/t/jp_where_ujis.test
+++ b/mysql-test/suite/jp/t/jp_where_ujis.test
diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test
index 7280bc33f21..7280bc33f21 100755..100644
--- a/mysql-test/suite/jp/t/jp_where_utf8.test
+++ b/mysql-test/suite/jp/t/jp_where_utf8.test