Bug#25516986 ORDER_BY_XXX TESTS FAIL WHEN CHANGING DEFAULT CHARACTER SET

To repeat:
./mtr --mem --charset-for-testdb=utf8mb4
order_by_all
order_by_icp_mrr
order_by_none
order_by_sortkey

Fix: re-record with explicit charset for queries/tables with mismatch
in explain output.

Also fix:
ds_mrr-big --big-test, use latin1 because utf8mb4 gave plan change.

Also fix: derived, use utf8mb4 except in cases with execution plan changes.

Author: Tor Didriksen

mysql-test/include/order_by.inc

@@ -220,7 +220,7 @@ CREATE TABLE t1 (
   info text NOT NULL default '',
   ipnr varchar(30) NOT NULL default '',
   PRIMARY KEY  (member_id)
-) ENGINE=MyISAM PACK_KEYS=1;
+) charset utf8mb4 ENGINE=MyISAM PACK_KEYS=1;
 
 insert into t1 (member_id) values (1),(2),(3);
 select member_id, nickname, voornaam FROM t1
@@ -231,7 +231,7 @@ drop table t1;
 # Test optimization of ORDER BY DESC
 #
 
-create table t1 (a int not null, b int, c varchar(10), key (a, b, c));
+create table t1 (a int not null, b int, c varchar(10), key (a, b, c)) charset utf8mb4;
 insert into t1 values (1, NULL, NULL), (1, NULL, 'b'), (1, 1, NULL), (1, 1, 'b'), (1, 1, 'b'), (2, 1, 'a'), (2, 1, 'b'), (2, 2, 'a'), (2, 2, 'b'), (2, 3, 'c'),(1,3,'b');
 
 explain select * from t1 where (a = 1 and b is null and c = 'b') or (a > 2) order by a desc;
@@ -397,7 +397,7 @@ CREATE TABLE t1 (
   KEY FieldKey (FieldKey),
   KEY LongField (FieldKey,LongVal),
   KEY StringField (FieldKey,StringVal(32))
-);
+) charset utf8mb4;
 INSERT INTO t1 VALUES ('0',3,'0'),('0',2,'1'),('0',1,'2'),('1',2,'1'),('1',1,'3'), ('1',0,'2'),('2',3,'0'),('2',2,'1'),('2',1,'2'),('2',3,'0'),('2',2,'1'),('2',1,'2'),('3',2,'1'),('3',1,'2'),('3','3','3');
 EXPLAIN SELECT * FROM t1 WHERE FieldKey = '1' ORDER BY LongVal;
 SELECT * FROM t1 WHERE FieldKey = '1' ORDER BY LongVal;
@@ -506,7 +506,8 @@ drop table t1, t2;
 # Bug #5428: a problem with small max_sort_length value
 #
 
-create table t1 (a char(25));
+# max_sort_length is in number of bytes, use latin1 to avoid strnxfrm.
+create table t1 (a char(25)) charset latin1;
 insert into t1 set a = repeat('x', 20);
 insert into t1 set a = concat(repeat('x', 19), 'z');
 insert into t1 set a = concat(repeat('x', 19), 'ab');
@@ -898,10 +899,12 @@ DROP TABLE t1;
 #
 
 CREATE TABLE t2 (a varchar(32), b int(11), c float, d double, 
-  UNIQUE KEY a (a,b,c), KEY b (b), KEY c (c));
+  UNIQUE KEY a (a,b,c), KEY b (b), KEY c (c)) charset utf8mb4;
 
-CREATE TABLE t1 (a varchar(32), b char(3), UNIQUE KEY a (a,b), KEY b (b));
-CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b));
+CREATE TABLE t1 (a varchar(32), b char(3), UNIQUE KEY a (a,b), KEY b (b))
+charset utf8mb4;
+CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b))
+charset utf8mb4;
 
 --disable_query_log
 INSERT INTO t1 (a, b) VALUES
@@ -1360,7 +1363,7 @@ DROP TABLE t1,t2,t3;
 --echo # WL#1393 - Optimizing filesort with small limit
 --echo #
 
-CREATE TABLE t1(f0 int auto_increment primary key, f1 int, f2 varchar(200));
+CREATE TABLE t1(f0 int auto_increment primary key, f1 int, f2 varchar(200)) charset latin1;
 INSERT INTO t1(f1, f2) VALUES 
 (0,"0"),(1,"1"),(2,"2"),(3,"3"),(4,"4"),(5,"5"),
 (6,"6"),(7,"7"),(8,"8"),(9,"9"),(10,"10"),

mysql-test/r/derived.result

@@ -15,22 +15,22 @@ pk INTEGER NOT NULL,
 i1 INTEGER NOT NULL,
 c1 VARCHAR(10) NOT NULL,
 PRIMARY KEY (pk)
-);
+) charset latin1;
 INSERT INTO t1
 SELECT a, 1, 'MySQL' FROM thousand;
 CREATE TABLE t2 (
 pk INTEGER NOT NULL,
 c1 VARCHAR(10) NOT NULL,
 c2 varchar(10) NOT NULL,
 PRIMARY KEY (pk)
-);
+) charset latin1;
 INSERT INTO t2
 SELECT a, 'MySQL', 'MySQL' FROM ten;
 CREATE TABLE t3 (
 pk INTEGER NOT NULL,
 c1 VARCHAR(10) NOT NULL,
 PRIMARY KEY (pk)
-);
+) charset latin1;
 INSERT INTO t3
 SELECT a, 'MySQL' FROM hundred;
 CREATE TABLE t4 (
@@ -40,12 +40,12 @@ c2 varchar(10) NOT NULL,
 c3 varchar(10) NOT NULL,
 PRIMARY KEY (pk),
 KEY k1 (c1_key)
-);
+) charset latin1;
 CREATE TABLE t5 (
 pk INTEGER NOT NULL,
 c1 VARCHAR(10) NOT NULL,
 PRIMARY KEY (pk)
-);
+) charset latin1;
 INSERT INTO t5
 SELECT a, 'MySQL' FROM ten;
 set optimizer_switch=`mrr=on,mrr_cost_based=off`;

mysql-test/r/ds_mrr-big.result

@@ -283,7 +283,7 @@ favo_muziek varchar(30) NOT NULL default '',
 info text NOT NULL default '',
 ipnr varchar(30) NOT NULL default '',
 PRIMARY KEY  (member_id)
-) ENGINE=MyISAM PACK_KEYS=1;
+) charset utf8mb4 ENGINE=MyISAM PACK_KEYS=1;
 Warnings:
 Warning	1101	BLOB, TEXT, GEOMETRY or JSON column 'info' can't have a default value
 insert into t1 (member_id) values (1),(2),(3);
@@ -293,13 +293,13 @@ member_id	nickname	voornaam
 1		
 2		
 drop table t1;
-create table t1 (a int not null, b int, c varchar(10), key (a, b, c));
+create table t1 (a int not null, b int, c varchar(10), key (a, b, c)) charset utf8mb4;
 insert into t1 values (1, NULL, NULL), (1, NULL, 'b'), (1, 1, NULL), (1, 1, 'b'), (1, 1, 'b'), (2, 1, 'a'), (2, 1, 'b'), (2, 2, 'a'), (2, 2, 'b'), (2, 3, 'c'),(1,3,'b');
 explain select * from t1 where (a = 1 and b is null and c = 'b') or (a > 2) order by a desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	a	a	22	NULL	2	100.00	Using where; Backward index scan; Using index
+1	SIMPLE	t1	NULL	range	a	a	52	NULL	2	100.00	Using where; Backward index scan; Using index
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (((`test`.`t1`.`c` = 'b') and (`test`.`t1`.`a` = 1) and isnull(`test`.`t1`.`b`)) or (`test`.`t1`.`a` > 2)) order by `test`.`t1`.`a` desc
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (((`test`.`t1`.`a` = 1) and isnull(`test`.`t1`.`b`) and (`test`.`t1`.`c` = 'b')) or (`test`.`t1`.`a` > 2)) order by `test`.`t1`.`a` desc
 select * from t1 where (a = 1 and b is null and c = 'b') or (a > 2) order by a desc;
 a	b	c
 1	NULL	b
@@ -314,7 +314,7 @@ EXPLAIN
   "query_block": {
     "select_id": 1,
     "cost_info": {
-      "query_cost": "2.38"
+      "query_cost": "2.51"
     },
     "ordering_operation": {
       "using_filesort": false,
@@ -335,10 +335,10 @@ EXPLAIN
         "backward_index_scan": true,
         "using_index": true,
         "cost_info": {
-          "read_cost": "1.38",
+          "read_cost": "1.51",
           "eval_cost": "1.00",
-          "prefix_cost": "2.38",
-          "data_read_per_join": "240"
+          "prefix_cost": "2.51",
+          "data_read_per_join": "560"
         },
         "used_columns": [
           "a",
@@ -439,7 +439,7 @@ Warning	1265	Data truncated for column 'b' at row 2
 Warning	1265	Data truncated for column 'c' at row 3
 explain select * from t1 order by a, b, c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	NULL	a	20	NULL	11	100.00	Using index
+1	SIMPLE	t1	NULL	index	NULL	a	50	NULL	11	100.00	Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` order by `test`.`t1`.`a`,`test`.`t1`.`b`,`test`.`t1`.`c`
 select * from t1 order by a, b, c;
@@ -457,7 +457,7 @@ a	b	c
 2	3	c
 explain select * from t1 order by a desc, b desc, c desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	NULL	a	20	NULL	11	100.00	Backward index scan; Using index
+1	SIMPLE	t1	NULL	index	NULL	a	50	NULL	11	100.00	Backward index scan; Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` order by `test`.`t1`.`a` desc,`test`.`t1`.`b` desc,`test`.`t1`.`c` desc
 select * from t1 order by a desc, b desc, c desc;
@@ -475,9 +475,9 @@ a	b	c
 1	0	
 explain select * from t1 where (a = 1 and b = 1 and c = 'b') or (a > 2) order by a desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	a	a	20	NULL	3	100.00	Using where; Backward index scan; Using index
+1	SIMPLE	t1	NULL	range	a	a	50	NULL	3	100.00	Using where; Backward index scan; Using index
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (((`test`.`t1`.`c` = 'b') and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or (`test`.`t1`.`a` > 2)) order by `test`.`t1`.`a` desc
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1) and (`test`.`t1`.`c` = 'b')) or (`test`.`t1`.`a` > 2)) order by `test`.`t1`.`a` desc
 select * from t1 where (a = 1 and b = 1 and c = 'b') or (a > 2) order by a desc;
 a	b	c
 1	1	b
@@ -693,11 +693,11 @@ StringVal mediumtext,
 KEY FieldKey (FieldKey),
 KEY LongField (FieldKey,LongVal),
 KEY StringField (FieldKey,StringVal(32))
-);
+) charset utf8mb4;
 INSERT INTO t1 VALUES ('0',3,'0'),('0',2,'1'),('0',1,'2'),('1',2,'1'),('1',1,'3'), ('1',0,'2'),('2',3,'0'),('2',2,'1'),('2',1,'2'),('2',3,'0'),('2',2,'1'),('2',1,'2'),('3',2,'1'),('3',1,'2'),('3','3','3');
 EXPLAIN SELECT * FROM t1 WHERE FieldKey = '1' ORDER BY LongVal;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	FieldKey,LongField,StringField	LongField	38	const	3	100.00	Using index condition
+1	SIMPLE	t1	NULL	ref	FieldKey,LongField,StringField	LongField	146	const	3	100.00	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FieldKey` AS `FieldKey`,`test`.`t1`.`LongVal` AS `LongVal`,`test`.`t1`.`StringVal` AS `StringVal` from `test`.`t1` where (`test`.`t1`.`FieldKey` = '1') order by `test`.`t1`.`LongVal`
 SELECT * FROM t1 WHERE FieldKey = '1' ORDER BY LongVal;
@@ -707,7 +707,7 @@ FieldKey	LongVal	StringVal
 1	2	1
 EXPLAIN SELECT * FROM t1 ignore index (FieldKey, LongField) WHERE FieldKey > '2' ORDER BY LongVal;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	StringField	StringField	38	NULL	4	100.00	Using where; Using filesort
+1	SIMPLE	t1	NULL	range	StringField	StringField	146	NULL	4	100.00	Using where; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FieldKey` AS `FieldKey`,`test`.`t1`.`LongVal` AS `LongVal`,`test`.`t1`.`StringVal` AS `StringVal` from `test`.`t1` IGNORE INDEX (`LongField`) IGNORE INDEX (`FieldKey`) where (`test`.`t1`.`FieldKey` > '2') order by `test`.`t1`.`LongVal`
 SELECT * FROM t1 WHERE FieldKey > '2' ORDER BY LongVal;
@@ -717,7 +717,7 @@ FieldKey	LongVal	StringVal
 3	3	3
 EXPLAIN SELECT * FROM t1 WHERE FieldKey > '2' ORDER BY FieldKey, LongVal;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	FieldKey,LongField,StringField	LongField	38	NULL	4	100.00	Using index condition
+1	SIMPLE	t1	NULL	range	FieldKey,LongField,StringField	LongField	146	NULL	4	100.00	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FieldKey` AS `FieldKey`,`test`.`t1`.`LongVal` AS `LongVal`,`test`.`t1`.`StringVal` AS `StringVal` from `test`.`t1` where (`test`.`t1`.`FieldKey` > '2') order by `test`.`t1`.`FieldKey`,`test`.`t1`.`LongVal`
 SELECT * FROM t1 WHERE FieldKey > '2' ORDER BY FieldKey, LongVal;
@@ -853,7 +853,7 @@ col2	col	col
 2	2	2
 1	3	3
 drop table t1, t2;
-create table t1 (a char(25));
+create table t1 (a char(25)) charset latin1;
 insert into t1 set a = repeat('x', 20);
 insert into t1 set a = concat(repeat('x', 19), 'z');
 insert into t1 set a = concat(repeat('x', 19), 'ab');
@@ -1883,19 +1883,21 @@ col
 DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE t2 (a varchar(32), b int(11), c float, d double, 
-UNIQUE KEY a (a,b,c), KEY b (b), KEY c (c));
-CREATE TABLE t1 (a varchar(32), b char(3), UNIQUE KEY a (a,b), KEY b (b));
-CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b));
+UNIQUE KEY a (a,b,c), KEY b (b), KEY c (c)) charset utf8mb4;
+CREATE TABLE t1 (a varchar(32), b char(3), UNIQUE KEY a (a,b), KEY b (b))
+charset utf8mb4;
+CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b))
+charset utf8mb4;
 INSERT INTO t3 SELECT * FROM t1;
 EXPLAIN
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	a,b	b	4	const	4	100.00	Using where; Using temporary; Using filesort
-1	SIMPLE	t2	NULL	ref	a,b,c	a	40	test.t1.a,const	11	79.85	Using index condition
+1	SIMPLE	t1	NULL	ref	a,b	b	13	const	3	100.00	Using where; Using temporary; Using filesort
+1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	11	79.85	Using index condition
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`b` = 'DE') and (`test`.`t2`.`a` = `test`.`t1`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`)) order by `test`.`t2`.`c` limit 1
+Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`a` = `test`.`t1`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`) and (`test`.`t1`.`b` = 'DE')) order by `test`.`t2`.`c` limit 1
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
@@ -1907,9 +1909,9 @@ WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	NULL	range	a,b,c	c	5	NULL	420	26.43	Using index condition; Using where
-1	SIMPLE	t1	NULL	ref	a	a	39	test.t2.a,const	10	100.00	Using index
+1	SIMPLE	t1	NULL	ref	a	a	144	test.t2.a,const	10	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t3` `t1` join `test`.`t2` where ((`test`.`t1`.`b` = 'DE') and (`test`.`t1`.`a` = `test`.`t2`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`)) order by `test`.`t2`.`c` limit 1
+Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t3` `t1` join `test`.`t2` where ((`test`.`t1`.`a` = `test`.`t2`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`) and (`test`.`t1`.`b` = 'DE')) order by `test`.`t2`.`c` limit 1
 SELECT d FROM t3 AS t1, t2 AS t2 
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
@@ -1919,7 +1921,7 @@ DROP TABLE t1,t2,t3;
 #
 # WL#1393 - Optimizing filesort with small limit
 #
-CREATE TABLE t1(f0 int auto_increment primary key, f1 int, f2 varchar(200));
+CREATE TABLE t1(f0 int auto_increment primary key, f1 int, f2 varchar(200)) charset latin1;
 INSERT INTO t1(f1, f2) VALUES 
 (0,"0"),(1,"1"),(2,"2"),(3,"3"),(4,"4"),(5,"5"),
 (6,"6"),(7,"7"),(8,"8"),(9,"9"),(10,"10"),