Bug#25474239 MISC MTR TESTS FAIL WHEN CHANGING DEFAULT CHARACTER SET FOR DATABASE

Patch #9

Also: Some tests failed in debug mode due to some DBUG_PRINT in the
range optimizer.
Fix: check _db_enabled_() before doing any tree traversal

To repeat:
./mtr --charset-for-testdb=utf8mb4 --defaults-file=include/utf8mb4_my.cnf

locking_part

innodb_icp
innodb_icp_all
innodb_icp_none
myisam_icp
myisam_icp_all
myisam_icp_none

optimizer_bug12837084

subselect_innodb.test

select_all
select_all_bka
select_all_bka_nixbnl
select_icp_mrr
select_icp_mrr_bka
select_icp_mrr_bka_nixbnl
select_none
select_none_bka
select_none_bka_nixbnl

Change-Id: I480fac2801e4135aa6d06c9ee8eb86d3f1f935d8

Author: Tor Didriksen

mysql-test/include/icp_tests.inc

@@ -26,10 +26,10 @@ DROP TABLE t1;
 #         the pushed index condition it is still evaluated.
 #         
 
-CREATE TABLE t1 (a INT);
+CREATE TABLE t1 (a INT) charset latin1;
 INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
-CREATE TABLE t2 (a INT);
+CREATE TABLE t2 (a INT) charset latin1;
 INSERT INTO t2 SELECT A.a + 10*(B.a + 10*C.a) FROM t1 A, t1 B, t1 C;
 
 CREATE TABLE t3 (
@@ -424,7 +424,7 @@ CREATE TABLE t3 (
   c1 TINYTEXT NOT NULL,
   i1 INT NOT NULL,
   KEY (c1(6),i1)
-);
+) charset utf8mb4;
 
 -- disable_query_log
 -- disable_result_log
@@ -526,7 +526,7 @@ CREATE TABLE t1 (
   c2 INT NOT NULL,
   PRIMARY KEY (c2),
   KEY id1 (c1(4))
-);
+) charset utf8mb4;
 
 INSERT INTO t1 VALUES ('Anastasia', 5);
 INSERT INTO t1 VALUES ('Karianne', 4);
@@ -555,7 +555,7 @@ CREATE TABLE t1 (
 
   KEY (col_int_key),
   KEY (col_varchar_key, col_int_key)
-) stats_persistent=0;
+) charset utf8mb4 stats_persistent=0;
 
 INSERT INTO t1 VALUES (NULL,2,'w');
 INSERT INTO t1 VALUES (7,9,'m');
@@ -644,7 +644,7 @@ DROP TABLE t1, t2;
 CREATE TABLE t1 (
   i1 INTEGER NOT NULL,
   c1 VARCHAR(1) NOT NULL
-);
+) charset latin1;
 
 INSERT INTO t1 VALUES (2,'w');
 
@@ -653,14 +653,14 @@ CREATE TABLE t2 (
   c1 VARCHAR(1) NOT NULL,
   c2 VARCHAR(1) NOT NULL,
   KEY (c1, i1)
-);
+) charset latin1;
 
 INSERT INTO t2 VALUES (8,'d','d');
 INSERT INTO t2 VALUES (4,'v','v');
 
 CREATE TABLE t3 (
   c1 VARCHAR(1) NOT NULL
-);
+) charset latin1;
 
 INSERT INTO t3 VALUES ('v');
 
@@ -965,7 +965,7 @@ CREATE TABLE t1 (
    i1 INTEGER,
    c1 VARCHAR(1),
    KEY col_varchar_key (c1)
-);
+) charset utf8mb4;
 
 INSERT INTO t1 VALUES (1,'j'), (0,'e'), (210,'f'), (8,'v'), (7,'x'),
                       (5,'m'), (NULL,'c');
@@ -974,15 +974,15 @@ CREATE TABLE t2 (
    i1 INTEGER,
    c1 VARCHAR(1),
    KEY col_varchar_key (c1)
-);
+) charset utf8mb4;
 
 INSERT INTO t2 VALUES (8,NULL);
 
 CREATE TABLE t3 (  
    i1 INTEGER,
    c1 VARCHAR(1),
    KEY col_varchar_key (c1)
-) ENGINE=InnoDB;
+) charset utf8mb4 ENGINE=InnoDB;
 
 INSERT INTO t3 VALUES (NULL,'w'), (1,NULL), (2,'d');
 
@@ -1029,7 +1029,7 @@ CREATE TABLE t1 (
   a INTEGER NOT NULL, 
   b CHAR(1), 
   KEY(b)
-);
+) charset utf8mb4;
 
 INSERT INTO t1 VALUES (23,5,'d');
 

mysql-test/include/select.inc

@@ -39,7 +39,7 @@ CREATE TABLE t2 (
   UNIQUE fld1 (fld1),
   KEY fld3 (fld3),
   PRIMARY KEY (auto)
-);  
+) charset utf8mb4;  
 
 #
 # Populate table
@@ -1997,7 +1997,7 @@ DROP TABLE t1, t2;
 # Test case for bug 7098: substitution of a constant for a string field 
 #
 
-CREATE TABLE t1 ( city char(30) );
+CREATE TABLE t1 ( city char(30) ) charset utf8mb4;
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');
 
@@ -2241,7 +2241,7 @@ create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));
 create table t11 like t1;
 insert into t1 values(1,""),(2,"");
 analyze table t1, t11;
---replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
+--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X 15 X
 show table status like 't1%';
 select 123 as a from t1 where f1 is null;
 drop table t1,t11;
@@ -2613,7 +2613,7 @@ SELECT IFNULL(NULL, NULL);
 SET @OLD_SQL_MODE12595=@@SQL_MODE, @@SQL_MODE='';
 SHOW LOCAL VARIABLES LIKE 'SQL_MODE';
 
-CREATE TABLE BUG_12595(a varchar(100));
+CREATE TABLE BUG_12595(a varchar(100)) charset latin1;
 INSERT INTO BUG_12595 VALUES ('hakan%'), ('hakank'), ("ha%an");
 SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%';
 SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';
@@ -3088,8 +3088,8 @@ drop table t1;
 # Bug #22735: no equality propagation for BETWEEN and IN with STRING arguments
 #
 
-CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16));
-CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10));
+CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16)) charset utf8mb4;
+CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10)) charset utf8mb4;
 
 INSERT INTO t1 VALUES
   ('d','dddd'), ('i','iii'), ('a','aa'), ('b','bb'), ('g','gg'), 
@@ -3116,9 +3116,9 @@ DROP TABLE t1,t2;
 # Bug #22367: Optimizer uses ref join type instead of eq_ref for simple 
 #               join on strings
 #
-CREATE TABLE t1 (a int, b varchar(20) NOT NULL, PRIMARY KEY(a));
+CREATE TABLE t1 (a int, b varchar(20) NOT NULL, PRIMARY KEY(a)) charset utf8mb4;
 CREATE TABLE t2 (a int, b varchar(20) NOT NULL,
-                 PRIMARY KEY (a), UNIQUE KEY (b));
+                 PRIMARY KEY (a), UNIQUE KEY (b)) charset utf8mb4;
 INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
 INSERT INTO t2 VALUES (1,'a'),(2,'b'),(3,'c');
 
@@ -3309,7 +3309,7 @@ insert into t1 values
   (coalesce(9223372036854775808, 1));
 select * from t1;
 drop table t1;
-create table t1 select
+create table t1 charset utf8mb4 select
   if(1, 9223372036854775808, 1) i,
   case when 1 then 9223372036854775808 else 1 end c,
   coalesce(9223372036854775808, 1) co;
@@ -3325,8 +3325,8 @@ select
 # Bug #22971: indexes on text columns are ignored for ref accesses 
 #
 
-CREATE TABLE t1 (name varchar(255));
-CREATE TABLE t2 (name varchar(255), n int, KEY (name(3)));
+CREATE TABLE t1 (name varchar(255)) charset latin1;
+CREATE TABLE t2 (name varchar(255), n int, KEY (name(3))) charset latin1;
 INSERT INTO t1 VALUES ('ccc'), ('bb'), ('cc '), ('aa  '), ('aa');
 INSERT INTO t2 VALUES ('bb',1), ('aa',2), ('cc   ',3);
 INSERT INTO t2 VALUES (concat('cc ', 0x06), 4);
@@ -3347,8 +3347,8 @@ SELECT * FROM t1 LEFT JOIN t2 ON t1.name=t2.name;
 
 DROP TABLE t1,t2;
 
-CREATE TABLE t1 (name text);
-CREATE TABLE t2 (name text, n int, KEY (name(3)));
+CREATE TABLE t1 (name text) charset latin1;
+CREATE TABLE t2 (name text, n int, KEY (name(3))) charset latin1;
 INSERT INTO t1 VALUES ('ccc'), ('bb'), ('cc '), ('aa  '), ('aa');
 INSERT INTO t2 VALUES ('bb',1), ('aa',2), ('cc   ',3);
 INSERT INTO t2 VALUES (concat('cc ', 0x06), 4);
@@ -3473,7 +3473,7 @@ CREATE TABLE t1 (
   c3 bigint(20) DEFAULT NULL,
   c4 bigint(20) DEFAULT NULL,
   PRIMARY KEY (c1)
-);
+) charset utf8mb4;
 
 EXPLAIN EXTENDED 
 SELECT  join_2.c1  
@@ -3751,15 +3751,15 @@ CREATE TABLE t1 (f1 bigint(20) NOT NULL default '0',
                  f4 varchar(255) NOT NULL default '',
                  PRIMARY KEY (f1),
                  KEY key1 (f4),
-                 KEY key2 (f2));
+                 KEY key2 (f2)) charset latin1;
 CREATE TABLE t2 (f1 int(11) NOT NULL default '0',
                  f2 enum('A1','A2','A3') NOT NULL default 'A1',
                  f3 int(11) NOT NULL default '0',
                  PRIMARY KEY (f1),
-                 KEY key1 (f3));
+                 KEY key1 (f3)) charset latin1;
 CREATE TABLE t3 (f1 bigint(20) NOT NULL default '0',
                  f2 datetime NOT NULL default '1980-01-01 00:00:00',
-                 PRIMARY KEY (f1));
+                 PRIMARY KEY (f1)) charset latin1;
 
 insert into t1 values (1, 1, 1, 'abc');
 insert into t1 values (2, 1, 2, 'def');
@@ -3866,7 +3866,7 @@ SELECT * FROM t1 WHERE a='2001-01-01' AND a=b AND b='2001-01-01 00:00:00';
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE a='2001-01-01' AND a=b AND b='2001-01-01 00:00:00';
 DROP TABLE t1;
 
-CREATE TABLE t1(a DATETIME NOT NULL, b VARCHAR(20) NOT NULL);
+CREATE TABLE t1(a DATETIME NOT NULL, b VARCHAR(20) NOT NULL) charset utf8mb4;
 INSERT INTO t1 VALUES('2001-01-01', '2001-01-01');
 SELECT * FROM t1 WHERE a='2001-01-01' AND a=b AND b='2001-01-01 00:00:00';
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE a='2001-01-01' AND a=b AND b='2001-01-01 00:00:00';
@@ -4169,7 +4169,7 @@ DROP TABLE t1;
 --echo # Bug #54459: Assertion failed: param.sort_length, 
 --echo # file .\filesort.cc, line 149 (part II)
 --echo #
-CREATE TABLE t1(a ENUM('') NOT NULL);
+CREATE TABLE t1(a ENUM('') NOT NULL) charset latin1;
 INSERT INTO t1 VALUES (), (), ();
 EXPLAIN SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci;
 SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci;

mysql-test/r/innodb_icp.result

@@ -13,9 +13,9 @@ SELECT * FROM t1 WHERE c1='3' FOR UPDATE;
 c1	c2
 3	NULL
 DROP TABLE t1;
-CREATE TABLE t1 (a INT);
+CREATE TABLE t1 (a INT) charset latin1;
 INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-CREATE TABLE t2 (a INT);
+CREATE TABLE t2 (a INT) charset latin1;
 INSERT INTO t2 SELECT A.a + 10*(B.a + 10*C.a) FROM t1 A, t1 B, t1 C;
 CREATE TABLE t3 (
 c1 CHAR(10) NOT NULL,
@@ -389,11 +389,11 @@ CREATE TABLE t3 (
 c1 TINYTEXT NOT NULL,
 i1 INT NOT NULL,
 KEY (c1(6),i1)
-);
+) charset utf8mb4;
 INSERT INTO t3 SELECT CONCAT('c-',1000+t2.a,'=w'), 1 FROM t2;
 EXPLAIN SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	range	c1	c1	12	NULL	2	33.33	Using index condition; Using where
+1	SIMPLE	t3	NULL	range	c1	c1	30	NULL	2	33.33	Using index condition; Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t3`.`c1` AS `c1` from `test`.`t3` where ((`test`.`t3`.`c1` >= 'c-1004=w') and (`test`.`t3`.`c1` <= 'c-1006=w') and (`test`.`t3`.`i1` > 2))
 SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
@@ -475,14 +475,14 @@ c1 TINYTEXT NOT NULL,
 c2 INT NOT NULL,
 PRIMARY KEY (c2),
 KEY id1 (c1(4))
-);
+) charset utf8mb4;
 INSERT INTO t1 VALUES ('Anastasia', 5);
 INSERT INTO t1 VALUES ('Karianne', 4);
 SELECT * FROM t1 WHERE (c1 <= '6566-06-15' AND c2 <> 3);
 c1	c2
 EXPLAIN SELECT * FROM t1 WHERE (c1 <= '6566-06-15' AND c2 <> 3);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY,id1	id1	6	NULL	1	100.00	Using index condition; Using where
+1	SIMPLE	t1	NULL	range	PRIMARY,id1	id1	18	NULL	1	100.00	Using index condition; Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`c1` AS `c1`,`test`.`t1`.`c2` AS `c2` from `test`.`t1` where ((`test`.`t1`.`c1` <= '6566-06-15') and (`test`.`t1`.`c2` <> 3))
 DROP TABLE t1;
@@ -496,7 +496,7 @@ col_int_key INTEGER,
 col_varchar_key VARCHAR(1),
 KEY (col_int_key),
 KEY (col_varchar_key, col_int_key)
-) stats_persistent=0;
+) charset utf8mb4 stats_persistent=0;
 INSERT INTO t1 VALUES (NULL,2,'w');
 INSERT INTO t1 VALUES (7,9,'m');
 INSERT INTO t1 VALUES (9,3,'m');
@@ -528,7 +528,7 @@ WHERE table3.col_int_key != SOME ( SELECT c1 FROM t2 );
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	table1	NULL	ALL	col_int_key	NULL	NULL	NULL	19	100.00	NULL
 1	PRIMARY	table3	NULL	ALL	col_varchar_key	NULL	NULL	NULL	19	10.00	Using where; Using join buffer (Block Nested Loop)
-1	PRIMARY	table2	NULL	ref	col_varchar_key	col_varchar_key	4	test.table3.col_varchar_key	1	100.00	Using index
+1	PRIMARY	table2	NULL	ref	col_varchar_key	col_varchar_key	7	test.table3.col_varchar_key	1	100.00	Using index
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`table1`.`col_int_nokey` AS `col_int_nokey` from `test`.`t1` `table1` join `test`.`t1` `table2` join `test`.`t1` `table3` where ((`test`.`table2`.`col_varchar_key` = `test`.`table3`.`col_varchar_key`) and (`test`.`table3`.`col_int_nokey` = `test`.`table1`.`col_int_key`) and <nop>(<in_optimizer>(`test`.`table3`.`col_int_key`,<exists>(/* select#2 */ select 1 from `test`.`t2` where <if>(outer_field_is_not_null, (<cache>(`test`.`table3`.`col_int_key`) <> `test`.`t2`.`c1`), true)))))
@@ -574,19 +574,19 @@ DROP TABLE t1, t2;
 CREATE TABLE t1 (
 i1 INTEGER NOT NULL,
 c1 VARCHAR(1) NOT NULL
-);
+) charset latin1;
 INSERT INTO t1 VALUES (2,'w');
 CREATE TABLE t2 (
 i1 INTEGER NOT NULL,
 c1 VARCHAR(1) NOT NULL,
 c2 VARCHAR(1) NOT NULL,
 KEY (c1, i1)
-);
+) charset latin1;
 INSERT INTO t2 VALUES (8,'d','d');
 INSERT INTO t2 VALUES (4,'v','v');
 CREATE TABLE t3 (
 c1 VARCHAR(1) NOT NULL
-);
+) charset latin1;
 INSERT INTO t3 VALUES ('v');
 EXPLAIN SELECT i1
 FROM t1
@@ -865,20 +865,20 @@ CREATE TABLE t1 (
 i1 INTEGER,
 c1 VARCHAR(1),
 KEY col_varchar_key (c1)
-);
+) charset utf8mb4;
 INSERT INTO t1 VALUES (1,'j'), (0,'e'), (210,'f'), (8,'v'), (7,'x'),
 (5,'m'), (NULL,'c');
 CREATE TABLE t2 (  
 i1 INTEGER,
 c1 VARCHAR(1),
 KEY col_varchar_key (c1)
-);
+) charset utf8mb4;
 INSERT INTO t2 VALUES (8,NULL);
 CREATE TABLE t3 (  
 i1 INTEGER,
 c1 VARCHAR(1),
 KEY col_varchar_key (c1)
-) ENGINE=InnoDB;
+) charset utf8mb4 ENGINE=InnoDB;
 INSERT INTO t3 VALUES (NULL,'w'), (1,NULL), (2,'d');
 set @old_opt_switch=@@optimizer_switch;
 EXPLAIN SELECT i1
@@ -893,7 +893,7 @@ XOR i1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t3	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	col_varchar_key	NULL	NULL	NULL	1	100.00	NULL
-2	DEPENDENT SUBQUERY	t1	NULL	ref_or_null	col_varchar_key	col_varchar_key	4	func	2	33.33	Using where; Full scan on NULL key
+2	DEPENDENT SUBQUERY	t1	NULL	ref_or_null	col_varchar_key	col_varchar_key	7	func	2	33.33	Using where; Full scan on NULL key
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t3`.`i1` AS `i1` from `test`.`t3` where (<in_optimizer>(`test`.`t3`.`c1`,<exists>(/* select#2 */ select 1 from `test`.`t2` join `test`.`t1` where ((`test`.`t1`.`c1` > `test`.`t2`.`c1`) and <if>(outer_field_is_not_null, ((<cache>(`test`.`t3`.`c1`) = `test`.`t1`.`c1`) or isnull(`test`.`t1`.`c1`)), true) and (`test`.`t2`.`i1` >= `test`.`t1`.`i1`)) having <if>(outer_field_is_not_null, <is_not_null_test>(`test`.`t1`.`c1`), true))) xor `test`.`t3`.`i1`)
 SELECT i1
@@ -918,16 +918,16 @@ pk INTEGER PRIMARY KEY,
 a INTEGER NOT NULL, 
 b CHAR(1), 
 KEY(b)
-);
+) charset utf8mb4;
 INSERT INTO t1 VALUES (23,5,'d');
 EXPLAIN SELECT a1.pk 
 FROM t1 AS a1 JOIN (SELECT * FROM t1 LIMIT 1) AS a2 ON a2.b = a1.b
 WHERE a1.a = (SELECT pk FROM t1 LIMIT 1) 
 AND (a1.a != a2.a OR a1.b IS NULL);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	<derived2>	NULL	system	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	PRIMARY	a1	NULL	ref	b	b	2	const	1	100.00	Using where
-3	SUBQUERY	t1	NULL	index	NULL	b	2	NULL	1	100.00	Using index
+1	PRIMARY	a1	NULL	ref	b	b	5	const	1	100.00	Using where
+3	SUBQUERY	t1	NULL	index	NULL	b	5	NULL	1	100.00	Using index
 2	DERIVED	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`a1`.`pk` AS `pk` from `test`.`t1` `a1` where ((`test`.`a1`.`b` = 'd') and (`test`.`a1`.`a` = (/* select#3 */ select `test`.`t1`.`pk` from `test`.`t1` limit 1)) and (((/* select#3 */ select `test`.`t1`.`pk` from `test`.`t1` limit 1) <> '5') or isnull(`test`.`a1`.`b`)))
@@ -943,8 +943,8 @@ WHERE a1.a = (SELECT pk FROM v1 LIMIT 1)
 AND (a1.a != a2.a OR a1.b IS NULL);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	<derived2>	NULL	system	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	PRIMARY	t1	NULL	ref	b	b	2	const	1	100.00	Using where
-3	SUBQUERY	t1	NULL	index	NULL	b	2	NULL	1	100.00	Using index
+1	PRIMARY	t1	NULL	ref	b	b	5	const	1	100.00	Using where
+3	SUBQUERY	t1	NULL	index	NULL	b	5	NULL	1	100.00	Using index
 2	DERIVED	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` where ((`test`.`t1`.`b` = 'd') and (`test`.`t1`.`a` = (/* select#3 */ select `test`.`t1`.`pk` from `test`.`t1` limit 1)) and ((`test`.`t1`.`a` <> '5') or isnull(`test`.`t1`.`b`)))