Bug #25562487: SOME TESTS IN MAIN SUITE FAIL WHEN CHANGING DEFAULT CHARSET

Following tests in main suite fail when changing default charset:
main.mysqltest
main.join_nested_bka
main.join_nested_bka_nixbnl

Fix:
Change to use explicit charset and record test results.

Change-Id: I492cceda2dac33fd25bab0694f953fec2f088059

Author: Xing Zhang

mysql-test/r/join_nested_bka.result

@@ -2317,7 +2317,7 @@ DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (
 carrier char(2) default NULL,
 id int NOT NULL auto_increment PRIMARY KEY
-);
+) CHARSET utf8mb4;
 INSERT INTO t1 VALUES
 ('CO',235371754),('CO',235376554),('CO',235376884),('CO',235377874),
 ('CO',231060394),('CO',231059224),('CO',231059314),('CO',231060484),
@@ -2382,7 +2382,7 @@ CREATE TABLE t4 (
 carrier char(2) NOT NULL default '' PRIMARY KEY,
 id int(11) default NULL,
 INDEX id(id)
-);
+) CHARSET utf8mb4;
 INSERT INTO t4 VALUES
 ('99',6),('SK',456),('UA',486),('AI',1081),('OS',1111),('VS',1510);
 CREATE TABLE t5 (
@@ -2413,7 +2413,7 @@ ON t4.carrier = t1.carrier;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	NULL	index	package_id	package_id	5	NULL	45	100.00	Using where; Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t2.package_id	1	100.00	Using join buffer (Batched Key Access)
-1	SIMPLE	t4	NULL	eq_ref	PRIMARY,id	PRIMARY	2	test.t1.carrier	1	100.00	NULL
+1	SIMPLE	t4	NULL	eq_ref	PRIMARY,id	PRIMARY	8	test.t1.carrier	1	100.00	NULL
 1	SIMPLE	t5	NULL	ref	carrier_id	carrier_id	5	test.t4.id	22	100.00	Using index
 1	SIMPLE	t3	NULL	ref	package_id	package_id	5	test.t2.package_id	1	100.00	Using index
 Warnings:

mysql-test/r/join_nested_bka_nixbnl.result

@@ -2317,7 +2317,7 @@ DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (
 carrier char(2) default NULL,
 id int NOT NULL auto_increment PRIMARY KEY
-);
+) CHARSET utf8mb4;
 INSERT INTO t1 VALUES
 ('CO',235371754),('CO',235376554),('CO',235376884),('CO',235377874),
 ('CO',231060394),('CO',231059224),('CO',231059314),('CO',231060484),
@@ -2382,7 +2382,7 @@ CREATE TABLE t4 (
 carrier char(2) NOT NULL default '' PRIMARY KEY,
 id int(11) default NULL,
 INDEX id(id)
-);
+) CHARSET utf8mb4;
 INSERT INTO t4 VALUES
 ('99',6),('SK',456),('UA',486),('AI',1081),('OS',1111),('VS',1510);
 CREATE TABLE t5 (
@@ -2413,7 +2413,7 @@ ON t4.carrier = t1.carrier;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	NULL	index	package_id	package_id	5	NULL	45	100.00	Using where; Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t2.package_id	1	100.00	Using join buffer (Batched Key Access)
-1	SIMPLE	t4	NULL	eq_ref	PRIMARY,id	PRIMARY	2	test.t1.carrier	1	100.00	NULL
+1	SIMPLE	t4	NULL	eq_ref	PRIMARY,id	PRIMARY	8	test.t1.carrier	1	100.00	NULL
 1	SIMPLE	t5	NULL	ref	carrier_id	carrier_id	5	test.t4.id	22	100.00	Using index
 1	SIMPLE	t3	NULL	ref	package_id	package_id	5	test.t2.package_id	1	100.00	Using index
 Warnings:

mysql-test/r/mysqltest.result

@@ -373,12 +373,12 @@ var3 two columns with same name
 var4 from query that returns NULL
 var5 from query that returns no row
 failing query in let
-create table t1 (a varchar(100));
+create table t1 (a varchar(100)) charset utf8mb4;
 insert into t1 values ('`select 42`');
 `select 42`
 insert into t1 values ('$dollar');
-$dollar
 `select 42`
+$dollar
 drop table t1;
 mysqltest: At line 1: query 'let $var2= `failing query`' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1
 mysqltest: At line 1: Missing required argument 'filename' to command 'source'
@@ -1206,15 +1206,15 @@ DROP TABLE t1;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TEMP_TABLE_INFO;
 COUNT(*)
 0
-CREATE /*! TEMPORARY */ TABLE t1 /* shouldn't fail */ (a INT);
+CREATE /*! TEMPORARY */ TABLE t1 /* shouldn't fail */ (a INT) CHARSET utf8mb4;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TEMP_TABLE_INFO;
 COUNT(*)
 1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
 DROP TEMPORARY TABLE t1;
 #
 # Bug#21048973 : SUPPORT "--ERROR CR_..." FOR COMMUNICATION RELATED ERRORS

mysql-test/t/join_nested.test

@@ -1501,7 +1501,7 @@ DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (
   carrier char(2) default NULL,
   id int NOT NULL auto_increment PRIMARY KEY
-);
+) CHARSET utf8mb4;
 INSERT INTO t1 VALUES
   ('CO',235371754),('CO',235376554),('CO',235376884),('CO',235377874),
   ('CO',231060394),('CO',231059224),('CO',231059314),('CO',231060484),
@@ -1569,7 +1569,7 @@ CREATE TABLE t4 (
   carrier char(2) NOT NULL default '' PRIMARY KEY,
   id int(11) default NULL,
   INDEX id(id)
-);
+) CHARSET utf8mb4;
 INSERT INTO t4 VALUES
   ('99',6),('SK',456),('UA',486),('AI',1081),('OS',1111),('VS',1510);
 

mysql-test/t/mysqltest.test

@@ -1023,7 +1023,7 @@ let $var2= `failing query`;
 echo $var2;
 EOF
 
-create table t1 (a varchar(100));
+create table t1 (a varchar(100)) charset utf8mb4;
 insert into t1 values ('`select 42`');
 let $a= `select * from t1`;
 # This should output `select 42`, not evaluate it again to 42
@@ -3237,7 +3237,7 @@ DROP TABLE t1;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TEMP_TABLE_INFO;
 
 # Should create a temporary table
-CREATE /*! TEMPORARY */ TABLE t1 /* shouldn't fail */ (a INT);
+CREATE /*! TEMPORARY */ TABLE t1 /* shouldn't fail */ (a INT) CHARSET utf8mb4;
 
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TEMP_TABLE_INFO;
 SHOW CREATE TABLE t1;