Skip to content

Commit f3bfd5f

Browse files
author
Tor Didriksen
committed
Bug#25673668 MIGRATE OPTIMIZER TESTS FROM LATIN1 TO UTF8MB4 PATCH#6
Several mtr tests have been temporarily rewritten to use latin1, convert to utf8mb4 where applicable. Change-Id: Iadd8c078916107a01ebb1eabec73096584f97b76
1 parent addca34 commit f3bfd5f

37 files changed

+115
-430
lines changed

‎mysql-test/include/index_merge1.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ drop table t0, t1, t2, t3;
810810
--echo # BUG#44810: index merge and order by with low sort_buffer_size
811811
--echo # crashes server!
812812
--echo #
813-
CREATE TABLE t1(a VARCHAR(128),b VARCHAR(128),KEY(A),KEY(B));
813+
CREATE TABLE t1(a VARCHAR(128),b VARCHAR(128),KEY(A),KEY(B)) charset latin1;
814814
INSERT INTO t1 VALUES (REPEAT('a',128),REPEAT('b',128));
815815
INSERT INTO t1 SELECT * FROM t1;
816816
INSERT INTO t1 SELECT * FROM t1;

‎mysql-test/include/index_merge2.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ create table t1
3131

3232
INDEX i1(key1),
3333
INDEX i2(key2)
34-
);
34+
) charset latin1;
3535

3636
--disable_query_log
3737
let $1=200;
@@ -89,7 +89,7 @@ create table t1 (
8989
filler char (200),
9090
index (key1),
9191
index (key2)
92-
);
92+
) charset latin1;
9393
show warnings;
9494
--disable_query_log
9595
let $1=30;
@@ -265,7 +265,7 @@ CREATE TABLE t1(
265265
PRIMARY KEY (t_cpac,t_vers,t_rele,t_cust),
266266
UNIQUE KEY IX_4 (t_cust,t_cpac,t_vers,t_rele),
267267
KEY IX_5 (t_vers,t_rele,t_cust)
268-
);
268+
) charset latin1;
269269

270270
insert into t1 values
271271
('tm','2.5 ','a ',' ','',''), ('tm','2.5U','a ','stnd','',''),

‎mysql-test/include/index_merge_ror.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ drop table t2;
373373
--echo # try to repair it
374374
--echo #
375375
CREATE TABLE t1(c1 INT, c2 INT DEFAULT 0, c3 CHAR(255) DEFAULT '',
376-
KEY(c1), KEY(c2), KEY(c3));
376+
KEY(c1), KEY(c2), KEY(c3)) charset latin1;
377377
INSERT INTO t1(c1) VALUES(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),
378378
(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0);
379379
INSERT INTO t1 VALUES(0,0,0);

‎mysql-test/include/ipv6_func.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
eval SET @nip= inet_aton('$IPv6');
2-
CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int);
2+
CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int) charset latin1;
33
INSERT INTO t1 VALUES (@nip,@nip,@nip,@nip,@nip,@nip);
44
SELECT inet_ntoa(c1) FROM t1;
55
SELECT inet_ntoa(CAST(c1 AS UNSIGNED)) FROM t1;
@@ -17,7 +17,7 @@ SELECT @nip;
1717
SELECT inet_ntoa(@nip);
1818

1919
eval SET @nip6= inet6_aton('$IPv6');
20-
CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int);
20+
CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int) charset latin1;
2121
INSERT IGNORE INTO t1 VALUES (@nip6,@nip6,@nip6,@nip6,@nip6,@nip6);
2222
SELECT inet6_ntoa(c1) FROM t1;
2323
SELECT inet6_ntoa(CAST(c1 AS BINARY(16))) FROM t1;

‎mysql-test/r/func_aes.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ YQ==
232232
Warnings:
233233
Warning 1618 <IV> option ignored
234234
#### 128, 192 and 256 bit ECB
235-
CREATE TABLE aes_ecb(a VARCHAR(16), b128 CHAR(16), b192 CHAR(16), b256 CHAR(16));
235+
CREATE TABLE aes_ecb(a VARCHAR(16), b128 CHAR(16), b192 CHAR(16), b256 CHAR(16)) charset latin1;
236236
INSERT INTO aes_ecb (a) VALUES ('a'), ('Жоро'), (REPEAT('a', 10));
237237
SET SESSION block_encryption_mode='aes-128-ecb';
238238
UPDATE aes_ecb SET b128 = AES_ENCRYPT(a, 'a');

‎mysql-test/r/func_aes_misc.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ SET @@session.block_encryption_mode = 'aes-128-ecb';
202202
DROP TABLE IF EXISTS t1;
203203
Warnings:
204204
Note 1051 Unknown table 'test.t1'
205-
CREATE TABLE t1(f1 varchar(256));
205+
CREATE TABLE t1(f1 varchar(256)) charset latin1;
206206
INSERT INTO t1 values(AES_ENCRYPT(@ENCSTR, @KEYS, @IV));
207207
Warnings:
208208
Warning 1618 <IV> option ignored

‎mysql-test/r/func_gconcat.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ show create table t2;
471471
Table Create Table
472472
t2 CREATE TABLE `t2` (
473473
`a` varchar(400) CHARACTER SET cp1250 DEFAULT NULL
474-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
474+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
475475
select collation(group_concat(a,_koi8r'test')) from t1;
476476
collation(group_concat(a,_koi8r'test'))
477477
cp1250_general_ci
@@ -643,17 +643,17 @@ create table t3 (select group_concat(a) as a from t1 where a = 'a') union
643643
(select group_concat(b) as a from t1 where a = 'b');
644644
select charset(a) from t2;
645645
charset(a)
646-
latin1
646+
utf8mb4
647647
select charset(a) from t3;
648648
charset(a)
649-
latin1
650-
latin1
649+
utf8mb4
650+
utf8mb4
651651
drop table t1, t2, t3;
652652
set names default;
653653
create table t1 (c1 varchar(10), c2 int);
654654
select charset(group_concat(c1 order by c2)) from t1;
655655
charset(group_concat(c1 order by c2))
656-
latin1
656+
utf8mb4
657657
drop table t1;
658658
CREATE TABLE t1 (a INT(10), b LONGTEXT, PRIMARY KEY (a));
659659
SET GROUP_CONCAT_MAX_LEN = 20000000;
@@ -1129,15 +1129,15 @@ CREATE TABLE t2 SELECT GROUP_CONCAT(f1 order by f2) FROM t1;
11291129
SHOW CREATE TABLE t2;
11301130
Table Create Table
11311131
t2 CREATE TABLE `t2` (
1132-
`GROUP_CONCAT(f1 order by f2)` mediumtext
1133-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
1132+
`GROUP_CONCAT(f1 order by f2)` longtext
1133+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
11341134
DROP TABLE t2;
11351135
CREATE TABLE t2 SELECT GROUP_CONCAT(UPPER(f1) ORDER BY f2) FROM t1;
11361136
SHOW CREATE TABLE t2;
11371137
Table Create Table
11381138
t2 CREATE TABLE `t2` (
1139-
`GROUP_CONCAT(UPPER(f1) ORDER BY f2)` mediumtext
1140-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
1139+
`GROUP_CONCAT(UPPER(f1) ORDER BY f2)` longtext
1140+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
11411141
DROP TABLE t2;
11421142
SET group_concat_max_len= DEFAULT;
11431143
SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1;

‎mysql-test/r/func_group.result

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ select min(t1.a3), max(t2.a2) from t1, t2 where t1.a2 = 0 and t2.a3 = 'CA';
438438
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
439439
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
440440
Warnings:
441-
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(t1.a3)`,max(`test`.`t2`.`a2`) AS `max(t2.a2)` from `test`.`t1` join `test`.`t2` where (multiple equal(0, `test`.`t1`.`a2`) and multiple equal('CA', `test`.`t2`.`a3`))
441+
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(t1.a3)`,max(`test`.`t2`.`a2`) AS `max(t2.a2)` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`a3` = 'CA') and multiple equal(0, `test`.`t1`.`a2`))
442442
select min(t1.a3), max(t2.a2) from t1, t2 where t1.a2 = 0 and t2.a3 = 'CA';
443443
min(t1.a3) max(t2.a2)
444444
DEN San Diego
@@ -519,7 +519,7 @@ select max(a3) from t1 where a3 = 'MIN' and a2 = 2;
519519
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
520520
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
521521
Warnings:
522-
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(a3)` from `test`.`t1` where (multiple equal('MIN', `test`.`t1`.`a3`) and multiple equal(2, `test`.`t1`.`a2`))
522+
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(a3)` from `test`.`t1` where ((`test`.`t1`.`a3` = 'MIN') and multiple equal(2, `test`.`t1`.`a2`))
523523
select max(a3) from t1 where a3 = 'MIN' and a2 = 2;
524524
max(a3)
525525
MIN
@@ -528,7 +528,7 @@ select max(a3) from t1 where a3 = 'DEN' and a2 = 2;
528528
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
529529
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL No matching min/max row
530530
Warnings:
531-
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(a3)` from `test`.`t1` where (multiple equal('DEN', `test`.`t1`.`a3`) and multiple equal(2, `test`.`t1`.`a2`))
531+
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(a3)` from `test`.`t1` where ((`test`.`t1`.`a3` = 'DEN') and multiple equal(2, `test`.`t1`.`a2`))
532532
select max(a3) from t1 where a3 = 'DEN' and a2 = 2;
533533
max(a3)
534534
NULL
@@ -537,7 +537,7 @@ select max(t1.a3), min(t2.a2) from t1, t2 where t1.a2 = 2 and t1.a3 < 'MIN' and
537537
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
538538
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
539539
Warnings:
540-
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(t1.a3)`,min(`test`.`t2`.`a2`) AS `min(t2.a2)` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`a3` < 'MIN') and multiple equal(2, `test`.`t1`.`a2`) and multiple equal('CA', `test`.`t2`.`a3`))
540+
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(t1.a3)`,min(`test`.`t2`.`a2`) AS `min(t2.a2)` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`a3` < 'MIN') and (`test`.`t2`.`a3` = 'CA') and multiple equal(2, `test`.`t1`.`a2`))
541541
select max(t1.a3), min(t2.a2) from t1, t2 where t1.a2 = 2 and t1.a3 < 'MIN' and t2.a3 = 'CA';
542542
max(t1.a3) min(t2.a2)
543543
CHI Los Angeles
@@ -645,7 +645,7 @@ select min(a3) from t1 where a2 = 2 and a3 >= 'CHI' and a3 = 'MIN';
645645
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
646646
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
647647
Warnings:
648-
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(a3)` from `test`.`t1` where (multiple equal(2, `test`.`t1`.`a2`) and multiple equal('MIN', `test`.`t1`.`a3`))
648+
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(a3)` from `test`.`t1` where ((`test`.`t1`.`a3` = 'MIN') and multiple equal(2, `test`.`t1`.`a2`))
649649
select min(a3) from t1 where a2 = 2 and a3 >= 'CHI' and a3 = 'MIN';
650650
min(a3)
651651
MIN
@@ -670,13 +670,13 @@ AME AME
670670
explain
671671
select min(a1) from t1 where a1 > 'KKK' or a1 < 'XXX';
672672
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
673-
1 SIMPLE t1 NULL index PRIMARY PRIMARY 3 NULL 15 55.55 Using where; Using index
673+
1 SIMPLE t1 NULL index PRIMARY PRIMARY 12 NULL 15 55.55 Using where; Using index
674674
Warnings:
675675
Note 1003 /* select#1 */ select min(`test`.`t1`.`a1`) AS `min(a1)` from `test`.`t1` where ((`test`.`t1`.`a1` > 'KKK') or (`test`.`t1`.`a1` < 'XXX'))
676676
explain
677677
select min(a1) from t1 where a1 != 'KKK';
678678
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
679-
1 SIMPLE t1 NULL index PRIMARY PRIMARY 3 NULL 15 100.00 Using where; Using index
679+
1 SIMPLE t1 NULL index PRIMARY PRIMARY 12 NULL 15 100.00 Using where; Using index
680680
Warnings:
681681
Note 1003 /* select#1 */ select min(`test`.`t1`.`a1`) AS `min(a1)` from `test`.`t1` where (`test`.`t1`.`a1` <> 'KKK')
682682
explain
@@ -688,44 +688,44 @@ Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(a3)` from `test`.`
688688
explain
689689
select max(t1.a3), min(t2.a2) from t1, t2 where t1.a2 = 2 and t1.a3 < 'MIN' and t2.a3 > 'CA';
690690
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
691-
1 SIMPLE t1 NULL range k1 k1 7 NULL 1 100.00 Using where; Using index
692-
1 SIMPLE t2 NULL range k1 k1 3 NULL 4 100.00 Using where; Using index; Using join buffer (Block Nested Loop)
691+
1 SIMPLE t1 NULL range k1 k1 16 NULL 1 100.00 Using where; Using index
692+
1 SIMPLE t2 NULL range k1 k1 9 NULL 4 100.00 Using where; Using index; Using join buffer (Block Nested Loop)
693693
Warnings:
694694
Note 1003 /* select#1 */ select max(`test`.`t1`.`a3`) AS `max(t1.a3)`,min(`test`.`t2`.`a2`) AS `min(t2.a2)` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`a2` = 2) and (`test`.`t1`.`a3` < 'MIN') and (`test`.`t2`.`a3` > 'CA'))
695695
explain
696696
select min(a4 - 0.01) from t1;
697697
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
698-
1 SIMPLE t1 NULL index NULL k2 12 NULL 15 100.00 Using index
698+
1 SIMPLE t1 NULL index NULL k2 21 NULL 15 100.00 Using index
699699
Warnings:
700700
Note 1003 /* select#1 */ select min((`test`.`t1`.`a4` - 0.01)) AS `min(a4 - 0.01)` from `test`.`t1`
701701
explain
702702
select max(a4 + 0.01) from t1;
703703
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
704-
1 SIMPLE t1 NULL index NULL k2 12 NULL 15 100.00 Using index
704+
1 SIMPLE t1 NULL index NULL k2 21 NULL 15 100.00 Using index
705705
Warnings:
706706
Note 1003 /* select#1 */ select max((`test`.`t1`.`a4` + 0.01)) AS `max(a4 + 0.01)` from `test`.`t1`
707707
explain
708708
select min(a3) from t1 where (a2 +1 ) is null;
709709
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
710-
1 SIMPLE t1 NULL index NULL k1 7 NULL 15 100.00 Using where; Using index
710+
1 SIMPLE t1 NULL index NULL k1 16 NULL 15 100.00 Using where; Using index
711711
Warnings:
712712
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(a3)` from `test`.`t1` where isnull((`test`.`t1`.`a2` + 1))
713713
explain
714714
select min(a3) from t1 where (a2 + 1) = 2;
715715
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
716-
1 SIMPLE t1 NULL index NULL k1 7 NULL 15 100.00 Using where; Using index
716+
1 SIMPLE t1 NULL index NULL k1 16 NULL 15 100.00 Using where; Using index
717717
Warnings:
718718
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(a3)` from `test`.`t1` where ((`test`.`t1`.`a2` + 1) = 2)
719719
explain
720720
select min(a3) from t1 where 2 = (a2 + 1);
721721
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
722-
1 SIMPLE t1 NULL index NULL k1 7 NULL 15 100.00 Using where; Using index
722+
1 SIMPLE t1 NULL index NULL k1 16 NULL 15 100.00 Using where; Using index
723723
Warnings:
724724
Note 1003 /* select#1 */ select min(`test`.`t1`.`a3`) AS `min(a3)` from `test`.`t1` where (2 = (`test`.`t1`.`a2` + 1))
725725
explain
726726
select min(a2) from t1 where a2 < 2 * a2 - 8;
727727
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
728-
1 SIMPLE t1 NULL index NULL k1 7 NULL 15 33.33 Using where; Using index
728+
1 SIMPLE t1 NULL index NULL k1 16 NULL 15 33.33 Using where; Using index
729729
Warnings:
730730
Note 1003 /* select#1 */ select min(`test`.`t1`.`a2`) AS `min(a2)` from `test`.`t1` where (`test`.`t1`.`a2` < ((2 * `test`.`t1`.`a2`) - 8))
731731
explain
@@ -737,14 +737,14 @@ Note 1003 /* select#1 */ select min(`test`.`t1`.`a1`) AS `min(a1)` from `test`.`
737737
explain
738738
select min(a4) from t1 where (a4 + 0.01) between 0.07 and 0.08;
739739
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
740-
1 SIMPLE t1 NULL index NULL k2 12 NULL 15 100.00 Using where; Using index
740+
1 SIMPLE t1 NULL index NULL k2 21 NULL 15 100.00 Using where; Using index
741741
Warnings:
742742
Note 1003 /* select#1 */ select min(`test`.`t1`.`a4`) AS `min(a4)` from `test`.`t1` where ((`test`.`t1`.`a4` + 0.01) between 0.07 and 0.08)
743743
explain
744744
select concat(min(t1.a1),min(t2.a4)) from t1, t2 where t2.a4 <> 'AME';
745745
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
746-
1 SIMPLE t2 NULL range k2 k2 4 NULL 6 100.00 Using where; Using index
747-
1 SIMPLE t1 NULL index NULL PRIMARY 3 NULL 15 100.00 Using index; Using join buffer (Block Nested Loop)
746+
1 SIMPLE t2 NULL range k2 k2 13 NULL 6 100.00 Using where; Using index
747+
1 SIMPLE t1 NULL index NULL PRIMARY 12 NULL 15 100.00 Using index; Using join buffer (Block Nested Loop)
748748
Warnings:
749749
Note 1003 /* select#1 */ select concat(min(`test`.`t1`.`a1`),min(`test`.`t2`.`a4`)) AS `concat(min(t1.a1),min(t2.a4))` from `test`.`t1` join `test`.`t2` where (`test`.`t2`.`a4` <> 'AME')
750750
drop table t1, t2;
@@ -764,21 +764,21 @@ show create table t1;
764764
Table Create Table
765765
t1 CREATE TABLE `t1` (
766766
`a` char(1) CHARACTER SET latin2 DEFAULT NULL
767-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
767+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
768768
create table t2 select max(a),min(a) from t1;
769769
show create table t2;
770770
Table Create Table
771771
t2 CREATE TABLE `t2` (
772772
`max(a)` char(1) CHARACTER SET latin2 DEFAULT NULL,
773773
`min(a)` char(1) CHARACTER SET latin2 DEFAULT NULL
774-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
774+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
775775
drop table t2;
776776
create table t2 select concat(a) from t1;
777777
show create table t2;
778778
Table Create Table
779779
t2 CREATE TABLE `t2` (
780780
`concat(a)` varchar(1) CHARACTER SET latin2 DEFAULT NULL
781-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
781+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
782782
drop table t2,t1;
783783
create table t1 (a int);
784784
insert into t1 values (1);
@@ -867,7 +867,7 @@ show create table t2;
867867
Table Create Table
868868
t2 CREATE TABLE `t2` (
869869
`MAX(b)` datetime DEFAULT NULL
870-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
870+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
871871
drop table t1, t2;
872872
SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
873873
Warnings:
@@ -1031,7 +1031,7 @@ select col1,sum(col1),max(col1),min(col1) from t1 group by col1;
10311031
col1 sum(col1) max(col1) min(col1)
10321032
5.000000000010 10.000000000020 5.000000000010 5.000000000010
10331033
DROP TABLE t1;
1034-
CREATE TABLE t1 (a VARCHAR(400));
1034+
CREATE TABLE t1 (a VARCHAR(400)) charset latin1;
10351035
INSERT INTO t1 (a) VALUES ("A"), ("a"), ("a "), ("a "),
10361036
("B"), ("b"), ("b "), ("b ");
10371037
SELECT COUNT(DISTINCT a) FROM t1;
@@ -1114,14 +1114,14 @@ show create table t1;
11141114
Table Create Table
11151115
t1 CREATE TABLE `t1` (
11161116
`variance(0)` double DEFAULT NULL
1117-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
1117+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
11181118
drop table t1;
11191119
create table t1 select stddev(0);
11201120
show create table t1;
11211121
Table Create Table
11221122
t1 CREATE TABLE `t1` (
11231123
`stddev(0)` double DEFAULT NULL
1124-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
1124+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
11251125
drop table t1;
11261126
create table bug22555 (i smallint primary key auto_increment, s1 smallint, s2 smallint, e decimal(30,10), o double);
11271127
insert into bug22555 (s1, s2, e, o) values (53, 78, 11.4276528, 6.828112), (17, 78, 5.916793, 1.8502951), (18, 76, 2.679231, 9.17975591), (31, 62, 6.07831, 0.1), (19, 41, 5.37463, 15.1), (83, 73, 14.567426, 7.959222), (92, 53, 6.10151, 13.1856852), (7, 12, 13.92272, 3.442007), (92, 35, 11.95358909, 6.01376678), (38, 84, 2.572, 7.904571);

‎mysql-test/r/func_misc.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Table Create Table
9797
t1 CREATE TABLE `t1` (
9898
`uuid()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT '',
9999
`length(uuid())` int(10) NOT NULL DEFAULT '0'
100-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
100+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
101101
drop table t1;
102102
#------------------------------------------------------------------------
103103
# Tests for Bug#6760 and Bug#12689
@@ -198,7 +198,7 @@ show create table t1;
198198
Table Create Table
199199
t1 CREATE TABLE `t1` (
200200
`a` bigint(21) unsigned DEFAULT NULL
201-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
201+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
202202
drop table t1;
203203
drop table if exists table_26093;
204204
drop function if exists func_26093_a;

‎mysql-test/r/func_system.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ t1 CREATE TABLE `t1` (
5353
`database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL,
5454
`user()` varchar(93) CHARACTER SET utf8 NOT NULL DEFAULT '',
5555
`version` char(60) DEFAULT NULL
56-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
56+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
5757
drop table t1;
5858
select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
5959
charset(charset(_utf8'a')) charset(collation(_utf8'a'))
@@ -67,7 +67,7 @@ Table Create Table
6767
t1 CREATE TABLE `t1` (
6868
`charset(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
6969
`collation(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT ''
70-
) ENGINE=ENGINE DEFAULT CHARSET=latin1
70+
) ENGINE=ENGINE DEFAULT CHARSET=utf8mb4
7171
drop table t1;
7272
select TRUE,FALSE,NULL;
7373
TRUE FALSE NULL

‎mysql-test/r/func_test.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,12 @@ SHOW CREATE TABLE t1;
336336
Table Create Table
337337
t1 CREATE TABLE `t1` (
338338
`greatest(-1, 9223372036854775808)` bigint(19) unsigned NOT NULL DEFAULT '0'
339-
) ENGINE=InnoDB DEFAULT CHARSET=latin1
339+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
340340
SHOW CREATE TABLE t2;
341341
Table Create Table
342342
t2 CREATE TABLE `t2` (
343343
`greatest(9223372036854775808, 9223372036854775808)` bigint(19) unsigned NOT NULL DEFAULT '0'
344-
) ENGINE=InnoDB DEFAULT CHARSET=latin1
344+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
345345
DROP TABLE t1, t2;
346346
#
347347
# Bug#22839888 UNINITIALIZED VALUE WHEN CONVERTING

‎mysql-test/r/func_time.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ t1 CREATE TABLE `t1` (
962962
`curtime() - curtime()` int(9) NOT NULL DEFAULT '0',
963963
`sec_to_time(1) + 0` int(9) DEFAULT NULL,
964964
`from_unixtime(1) + 0` bigint(16) DEFAULT NULL
965-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
965+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
966966
drop table t1;
967967
SELECT SEC_TO_TIME(3300000);
968968
SEC_TO_TIME(3300000)
@@ -1834,7 +1834,7 @@ SHOW CREATE TABLE t1;
18341834
Table Create Table
18351835
t1 CREATE TABLE `t1` (
18361836
`IF(0, coalesce(NULL), now(0)) + 0` decimal(21,6) DEFAULT NULL
1837-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
1837+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
18381838
DROP TABLE t1;
18391839
#
18401840
# Bug#13982125 BUFFER OVERFLOW OF VARIABLE BUF IN

0 commit comments

Comments
 (0)