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

Post-fix patch: fix failing test main.join_nested.

Change-Id: Ic0e577a86d368b5b85e08656d121abab236b2554

Author: Xing Zhang

mysql-test/r/join_nested.result

@@ -2316,7 +2316,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),
@@ -2381,7 +2381,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 (
@@ -2412,7 +2412,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	NULL
-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: