MDEV-33698 tests in the jp suite fail

mysql-test/suite/jp/r/jp_convert_ucs2.result

@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/r/jp_convert_utf8.result

@@ -7,6 +7,7 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;

mysql-test/suite/jp/r/jp_like_ucs2.result

@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/r/jp_like_utf8.result

@@ -7,6 +7,7 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;

mysql-test/suite/jp/r/jp_ltrim_ucs2.result

@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/r/jp_ltrim_utf8.result

@@ -7,6 +7,7 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;

mysql-test/suite/jp/r/jp_select_ucs2.result

@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/r/jp_select_utf8.result

@@ -7,6 +7,7 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;

mysql-test/suite/jp/r/jp_where_ucs2.result

@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/r/jp_where_utf8.result

@@ -7,6 +7,7 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;

mysql-test/suite/jp/t/jp_convert_ucs2.test

@@ -20,6 +20,7 @@ drop table if exists `
 # Test CONVERT() function with Japanese character in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/t/jp_convert_utf8.test

@@ -19,6 +19,7 @@ drop table if exists `Ｔ９`;
 # Test CONVERT() function with Japanese character in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 

mysql-test/suite/jp/t/jp_like_ucs2.test

@@ -17,6 +17,7 @@ drop table if exists `
 # Test LIKE pattern matching using Japanese characters in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/t/jp_like_utf8.test

@@ -16,6 +16,8 @@ drop table if exists `Ｔ９`;
 # Test LIKE pattern matching using Japanese characters in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
+
 SET NAMES utf8;
 SET character_set_database = utf8;
 

mysql-test/suite/jp/t/jp_ltrim_ucs2.test

@@ -17,6 +17,7 @@ drop table if exists `
 # Test LTRIM() function with Japanese characters in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/t/jp_ltrim_utf8.test

@@ -16,6 +16,7 @@ drop table if exists `Ｔ９`;
 # Test LTRIM() function with Japanese characters in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 

mysql-test/suite/jp/t/jp_select_ucs2.test

@@ -17,6 +17,7 @@ drop table if exists `
 # Test Displaying Japanese charact in ucs2 encoding 
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/t/jp_select_utf8.test

@@ -16,6 +16,7 @@ drop table if exists `Ｔ９`;
 # Test Displaying Japanese charact in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 

mysql-test/suite/jp/t/jp_where_ucs2.test

@@ -17,6 +17,7 @@ drop table if exists `
 # Test Displaying Japanese charact using WHERE condtion in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;

mysql-test/suite/jp/t/jp_where_utf8.test

@@ -16,6 +16,7 @@ drop table if exists `Ｔ９`;
 # Test Displaying Japanese charact using WHERE condition in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;