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

Patch #5

To repeat:
./mtr --mem --charset-for-testdb=utf8mb4

costmodel_planchange
func_str
func_weight_string
group_min_max
loaddata
outfile_loaddata

Fix: re-record with explicit charset for queries/tables

Author: Tor Didriksen

mysql-test/r/func_str.result

@@ -25,14 +25,14 @@ hex(weight_string('aa' as binary(3)))
 select hex(weight_string(cast('aa' as binary(3))));
 hex(weight_string(cast('aa' as binary(3))))
 616100
-create table t1 select weight_string('test') as w;
+create table t1 charset latin1 select weight_string('test') as w;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `w` varbinary(4) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 drop table t1;
-create table t1 select weight_string(repeat('t',66000)) as w;
+create table t1 charset latin1 select weight_string(repeat('t',66000)) as w;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -51,7 +51,7 @@ coercibility(weight_string('test'))
 select coercibility(weight_string('test' collate latin1_swedish_ci));
 coercibility(weight_string('test' collate latin1_swedish_ci))
 0
-create table t1 (s1 varchar(5));
+create table t1 (s1 varchar(5)) charset latin1;
 insert into t1 values ('a'),(null);
 select hex(weight_string(s1)) from t1 order by s1;
 hex(weight_string(s1))
@@ -96,7 +96,7 @@ DROP VIEW v1;
 DROP VIEW v5;
 DROP VIEW v6;
 DROP TABLE t1;
-CREATE TABLE t1 (a VARCHAR(10));
+CREATE TABLE t1 (a VARCHAR(10)) charset latin1;
 INSERT INTO t1 VALUES ('abcd');
 INSERT INTO t1 VALUES ('dcba');
 CREATE VIEW v1 AS SELECT WEIGHT_STRING(_latin1 'ab') AS b;

mysql-test/r/func_weight_string.result

@@ -1,7 +1,7 @@
 drop table if exists t1;
 create table t1 (
 a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(248) default ' '
-);
+) charset latin1;
 insert into t1 (a1, a2, b, c, d) values
 ('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),
 ('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),
@@ -44,7 +44,7 @@ test.t1	analyze	status	Table is already up to date
 drop table if exists t2;
 create table t2 (
 a1 char(64), a2 char(64) not null, b char(16), c char(16), d char(16), dummy char(248) default ' '
-);
+) charset latin1;
 insert into t2 select * from t1;
 insert into t2 (a1, a2, b, c, d) values
 ('a','a',NULL,'a777','xyz'),('a','a',NULL,'a888','xyz'),('a','a',NULL,'a999','xyz'),
@@ -72,7 +72,7 @@ test.t2	analyze	status	Table is already up to date
 drop table if exists t3;
 create table t3 (
 a1 char(1), a2 char(1), b char(1), c char(4) not null, d char(3), dummy char(1) default ' '
-);
+) charset latin1;
 insert into t3 (a1, a2, b, c, d) values
 ('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),
 ('a','a','b','e112','xy1'),('a','a','b','f112','xy2'),('a','a','b','g112','xy3'),('a','a','b','h112','xy4'),
@@ -2328,7 +2328,7 @@ c1	c2
 30	8
 30	9
 drop table t1;
-CREATE TABLE t1 (a varchar(5), b int(11), PRIMARY KEY (a,b));
+CREATE TABLE t1 (a varchar(5), b int(11), PRIMARY KEY (a,b)) charset utf8mb4;
 INSERT INTO t1 VALUES ('AA',1), ('AA',2), ('AA',3), ('BB',1), ('AA',4);
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -2341,12 +2341,12 @@ a
 BB
 EXPLAIN SELECT a FROM t1 WHERE a='AA' GROUP BY a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	7	NULL	1	100.00	Using where; Using index for group-by
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	22	NULL	1	100.00	Using where; Using index for group-by
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` = 'AA') group by `test`.`t1`.`a`
 EXPLAIN SELECT a FROM t1 WHERE a='BB' GROUP BY a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	PRIMARY	PRIMARY	7	const	1	100.00	Using index
+1	SIMPLE	t1	NULL	ref	PRIMARY	PRIMARY	22	const	1	100.00	Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` = 'BB') group by `test`.`t1`.`a`
 SELECT DISTINCT a FROM t1 WHERE a='BB';
@@ -2396,14 +2396,14 @@ COUNT(DISTINCT a)
 1
 DROP TABLE t1;
 DROP PROCEDURE a;
-CREATE TABLE t1 (a varchar(64) NOT NULL default '', PRIMARY KEY(a));
+CREATE TABLE t1 (a varchar(64) NOT NULL default '', PRIMARY KEY(a)) charset utf8mb4;
 INSERT INTO t1 (a) VALUES 
 (''), ('CENTRAL'), ('EASTERN'), ('GREATER LONDON'),
 ('NORTH CENTRAL'), ('NORTH EAST'), ('NORTH WEST'), ('SCOTLAND'),
 ('SOUTH EAST'), ('SOUTH WEST'), ('WESTERN');
 EXPLAIN SELECT DISTINCT a,a FROM t1 ORDER BY a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	66	NULL	11	100.00	Using index
+1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	258	NULL	11	100.00	Using index
 Warnings:
 Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a`,`test`.`t1`.`a` AS `a` from `test`.`t1` order by `test`.`t1`.`a`
 SELECT DISTINCT a,a FROM t1 ORDER BY a;
@@ -3605,7 +3605,7 @@ CREATE TABLE t1 (
 f1 int(11) NOT NULL DEFAULT '0',
 f2 char(1) NOT NULL DEFAULT '',
 PRIMARY KEY (f1,f2)
-) ;
+)  charset utf8mb4;
 insert into t1 values(1,'A'),(1 , 'B'), (1, 'C'), (2, 'A'), 
 (3, 'A'), (3, 'B'), (3, 'C'), (3, 'D');
 SELECT f1, COUNT(DISTINCT f2) FROM t1 GROUP BY f1;
@@ -3615,7 +3615,7 @@ f1	COUNT(DISTINCT f2)
 3	4
 explain SELECT f1, COUNT(DISTINCT f2) FROM t1 GROUP BY f1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	5	NULL	9	100.00	Using index for group-by (scanning)
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	8	NULL	9	100.00	Using index for group-by (scanning)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,count(distinct `test`.`t1`.`f2`) AS `COUNT(DISTINCT f2)` from `test`.`t1` group by `test`.`t1`.`f1`
 drop table t1;

mysql-test/r/group_min_max.result

@@ -42,7 +42,7 @@ Field 3,'Field 4|
 |Field 5' ,'Field 6|	NULL
 |Field 6|	| 'Field 7'|
 drop table t1;
-create table t1 (a int, b char(10));
+create table t1 (a int, b char(10)) charset latin1;
 load data infile '../../std_data/loaddata3.dat' ignore into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
 Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3

mysql-test/r/loaddata.result

@@ -79,7 +79,7 @@ DROP TABLE t1;
 #
 # Bug#32533: SELECT INTO OUTFILE never escapes multibyte character
 #
-CREATE TABLE t1 (c1 VARCHAR(256));
+CREATE TABLE t1 (c1 VARCHAR(256) charset latin1);
 INSERT INTO t1 VALUES (0xC3);
 SELECT HEX(c1) FROM t1;
 HEX(c1)
@@ -89,7 +89,7 @@ TRUNCATE t1;
 SELECT HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'));
 HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'))
 C35CC3C30A
-LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 CHARACTER SET latin1 FIELDS ENCLOSED BY 0xC3;
 SELECT HEX(c1) FROM t1;
 HEX(c1)
 C3

mysql-test/r/outfile_loaddata.result

@@ -390,7 +390,7 @@ select collation(insert(_latin2'abcd',2,3,_latin2'ef')), coercibility(insert(_la
 select collation(replace(_latin2'abcd',_latin2'b',_latin2'B')), coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'));
 select collation(encode('abcd','ab')), coercibility(encode('abcd','ab'));
 
-create table t1 
+create table t1 charset latin1
 select
   bin(130),
   oct(130),
@@ -465,7 +465,7 @@ select SUBSTR('abcdefg',1,-1) FROM DUAL;
 # Test that fix_fields doesn't follow to upper level (to comparison)
 # when an error on a lower level (in concat) has accured:
 #
-create table t7 (s1 char);
+create table t7 (s1 char) charset latin1;
 --error 1267
 select * from t7
 where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci) = 'AA';
@@ -615,7 +615,7 @@ SELECT CHAR_LENGTH(CHAR(NULL,121,83,81,'76')) as my_column;
 # Test case for bug #8669: null aes_decrypt result in order by query
 #
 
-CREATE TABLE t1 (id int PRIMARY KEY, str char(255) NOT NULL);
+CREATE TABLE t1 (id int PRIMARY KEY, str char(255) NOT NULL) charset latin1;
 CREATE TABLE t2 (id int NOT NULL UNIQUE);
 INSERT INTO t2 VALUES (1),(2);
 INSERT INTO t1 VALUES (1, aes_encrypt('foo', 'bar'));
@@ -741,7 +741,7 @@ drop table t1;
 #
 
 select load_file("lkjlkj");
-select ifnull(load_file("lkjlkj"),"it's null");
+select ifnull(load_file("lkjlkj"),"it is null");
 
 #
 # Bug#15351: Wrong collation used for comparison of md5() and sha()
@@ -846,7 +846,7 @@ select "18383815659218730760" + 0;
 # Bug #21698: substitution of a string field for a constant under a function 
 #
 
-CREATE TABLE t1 (code varchar(10));
+CREATE TABLE t1 (code varchar(10)) charset utf8mb4;
 INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13');
 
 SELECT ASCII(code), code FROM t1 WHERE code='A12';
@@ -858,7 +858,7 @@ SELECT LENGTH(code), code FROM t1 WHERE code='A12';
 SELECT LENGTH(code), code FROM t1 WHERE code='A12' AND LENGTH(code)=5;
 
 ALTER TABLE t1 ADD INDEX (code);
-CREATE TABLE t2 (id varchar(10) PRIMARY KEY);
+CREATE TABLE t2 (id varchar(10) PRIMARY KEY) charset utf8mb4;
 INSERT INTO t2 VALUES ('a11'), ('a12'), ('a13'), ('a14');
 
 SELECT * FROM t1 INNER JOIN t2 ON t1.code=t2.id 
@@ -1428,7 +1428,7 @@ SELECT REPEAT('1', DAY(FROM_UNIXTIME(-1)));
 SELECT RPAD('hi', DAY(FROM_UNIXTIME(-1)),'?');
 SELECT LPAD('hi', DAY(FROM_UNIXTIME(-1)),'?');
 
-CREATE TABLE t1
+CREATE TABLE t1 charset utf8mb4
 SELECT SUBSTRING('1', DAY(FROM_UNIXTIME(-1))) AS f1,
        LEFT('1', DAY(FROM_UNIXTIME(-1))) AS f2,
        RIGHT('1', DAY(FROM_UNIXTIME(-1))) AS f3,
@@ -1500,7 +1500,7 @@ SELECT format(123, 1, 'Non-existent-locale');
 --echo #
 SELECT FORMAT(123.33, 2, 'no_NO'), FORMAT(1123.33, 2, 'no_NO');
 SELECT FORMAT(12333e-2, 2, 'no_NO'), FORMAT(112333e-2, 2, 'no_NO');
-CREATE TABLE t1 AS SELECT format(123,2,'no_NO');
+CREATE TABLE t1 charset utf8mb4 AS SELECT format(123,2,'no_NO');
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -1585,10 +1585,10 @@ let $1=64;
 while($1)
 {
   dec $1;
-  eval CREATE TABLE t1 AS SELECT TO_BASE64(REPEAT('a',$1)) AS to_base64;
+  eval CREATE TABLE t1 charset utf8mb4 AS SELECT TO_BASE64(REPEAT('a',$1)) AS to_base64;
   SHOW CREATE TABLE t1;
   SELECT to_base64, LENGTH(to_base64) FROM t1;
-  CREATE TABLE t2 AS SELECT from_base64(to_base64) AS from_base64 FROM t1;
+  CREATE TABLE t2 charset utf8mb4 AS SELECT from_base64(to_base64) AS from_base64 FROM t1;
   SHOW CREATE TABLE t2;
   SELECT from_base64, LENGTH(from_base64) FROM t2;
   DROP TABLE t2;

mysql-test/t/func_str.test

@@ -54,13 +54,13 @@ select hex(weight_string(cast('aa' as binary(3))));
 # then the result data type is VARBINARY. Otherwise
 # the result data type is BLOB.
 #
-create table t1 select weight_string('test') as w;
+create table t1 charset latin1 select weight_string('test') as w;
 
 #Replace default engine value with static engine string 
 --replace_result $DEFAULT_ENGINE ENGINE
 show create table t1;
 drop table t1;
-create table t1 select weight_string(repeat('t',66000)) as w;
+create table t1 charset latin1 select weight_string(repeat('t',66000)) as w;
 
 #Replace default engine value with static engine string 
 --replace_result $DEFAULT_ENGINE ENGINE
@@ -87,7 +87,7 @@ select coercibility(weight_string('test' collate latin1_swedish_ci));
 # Bug#33663 Character sets: weight_string function,
 # varchar column, wrong result
 #
-create table t1 (s1 varchar(5));
+create table t1 (s1 varchar(5)) charset latin1;
 insert into t1 values ('a'),(null);
 select hex(weight_string(s1)) from t1 order by s1;
 drop table t1;
@@ -117,7 +117,7 @@ DROP VIEW v1;
 DROP VIEW v5;
 DROP VIEW v6;
 DROP TABLE t1;
-CREATE TABLE t1 (a VARCHAR(10));
+CREATE TABLE t1 (a VARCHAR(10)) charset latin1;
 INSERT INTO t1 VALUES ('abcd');
 INSERT INTO t1 VALUES ('dcba');
 CREATE VIEW v1 AS SELECT WEIGHT_STRING(_latin1 'ab') AS b;

mysql-test/t/func_weight_string.test

@@ -21,7 +21,7 @@ drop table if exists t1;
 
 create table t1 (
   a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(248) default ' '
-);
+) charset latin1;
 
 insert into t1 (a1, a2, b, c, d) values
 ('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),
@@ -71,7 +71,7 @@ drop table if exists t2;
 
 create table t2 (
   a1 char(64), a2 char(64) not null, b char(16), c char(16), d char(16), dummy char(248) default ' '
-);
+) charset latin1;
 insert into t2 select * from t1;
 # add few rows with NULL's in the MIN/MAX column
 insert into t2 (a1, a2, b, c, d) values
@@ -108,7 +108,7 @@ drop table if exists t3;
 
 create table t3 (
   a1 char(1), a2 char(1), b char(1), c char(4) not null, d char(3), dummy char(1) default ' '
-);
+) charset latin1;
 
 insert into t3 (a1, a2, b, c, d) values
 ('a','a','a','a111','xy1'),('a','a','a','b111','xy2'),('a','a','a','c111','xy3'),('a','a','a','d111','xy4'),
@@ -727,7 +727,7 @@ drop table t1;
 #             returns impossible range
 #
 
-CREATE TABLE t1 (a varchar(5), b int(11), PRIMARY KEY (a,b));
+CREATE TABLE t1 (a varchar(5), b int(11), PRIMARY KEY (a,b)) charset utf8mb4;
 INSERT INTO t1 VALUES ('AA',1), ('AA',2), ('AA',3), ('BB',1), ('AA',4);
 OPTIMIZE TABLE t1;
 
@@ -785,7 +785,7 @@ DROP PROCEDURE a;
 # Bug #18068: SELECT DISTINCT
 #
 
-CREATE TABLE t1 (a varchar(64) NOT NULL default '', PRIMARY KEY(a));
+CREATE TABLE t1 (a varchar(64) NOT NULL default '', PRIMARY KEY(a)) charset utf8mb4;
 
 INSERT INTO t1 (a) VALUES 
   (''), ('CENTRAL'), ('EASTERN'), ('GREATER LONDON'),
@@ -1331,7 +1331,7 @@ CREATE TABLE t1 (
   f1 int(11) NOT NULL DEFAULT '0',
   f2 char(1) NOT NULL DEFAULT '',
   PRIMARY KEY (f1,f2)
-) ;
+)  charset utf8mb4;
 insert into t1 values(1,'A'),(1 , 'B'), (1, 'C'), (2, 'A'), 
 (3, 'A'), (3, 'B'), (3, 'C'), (3, 'D');
 

mysql-test/t/group_min_max.test

@@ -21,7 +21,7 @@ load data infile '../../std_data/loaddata2.dat' ignore into table t1 fields term
 select concat('|',a,'|'), concat('|',b,'|') from t1;
 drop table t1;
 
-create table t1 (a int, b char(10));
+create table t1 (a int, b char(10)) charset latin1;
 load data infile '../../std_data/loaddata3.dat' ignore into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 select * from t1;
 truncate table t1;
@@ -661,8 +661,9 @@ SET sql_mode=default;
 --copy_file $EXE_MYSQL $MYSQLTEST_VARDIR/mysql
 
 --echo # Without fix, load data hangs forever.
+# The actual error code depends on character set
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,1000
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,ER_INVALID_CHARACTER_STRING
 eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
      FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
 

mysql-test/t/loaddata.test

@@ -100,7 +100,7 @@ DROP TABLE t1;
 --echo # Bug#32533: SELECT INTO OUTFILE never escapes multibyte character
 --echo #
 
-CREATE TABLE t1 (c1 VARCHAR(256));
+CREATE TABLE t1 (c1 VARCHAR(256) charset latin1);
 INSERT INTO t1 VALUES (0xC3);
 SELECT HEX(c1) FROM t1;
 
@@ -119,7 +119,7 @@ TRUNCATE t1;
 # Disabled by WL#5094
 --disable_warnings
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---eval LOAD DATA INFILE '$file' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3
+--eval LOAD DATA INFILE '$file' INTO TABLE t1 CHARACTER SET latin1 FIELDS ENCLOSED BY 0xC3
 --enable_warnings
 SELECT HEX(c1) FROM t1;