Skip to content

Commit 36eba98

Browse files
committed
MDEV-19123 Change default charset from latin1 to utf8mb4
Changing the default server character set from latin1 to utf8mb4.
1 parent a2a5ba1 commit 36eba98

File tree

1,713 files changed

+31563
-30549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,713 files changed

+31563
-30549
lines changed

cmake/character_sets.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
# Charsets and collations
1717
IF(NOT DEFAULT_CHARSET)
18-
SET(DEFAULT_CHARSET "latin1")
18+
SET(DEFAULT_CHARSET "utf8mb4")
1919
ENDIF()
2020

2121
IF(NOT DEFAULT_COLLATION)
22-
SET(DEFAULT_COLLATION "latin1_swedish_ci")
22+
SET(DEFAULT_COLLATION "utf8mb4_uca1400_ai_ci")
2323
ENDIF()
2424

2525
SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8mb3 utf8mb4)
File renamed without changes.

mysql-test/include/check-warnings.test renamed to mysql-test/include/check-warnings.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ create temporary table error_log (
3030
suspicious int default 1,
3131
file_name varchar(255),
3232
line varchar(1024) default null
33-
) engine=myisam;
33+
) engine=myisam charset=latin1;
3434

3535
# Get the name of servers error log
3636
let $log_error= $MTR_LOG_ERROR;
@@ -41,7 +41,7 @@ let $log_warning= $log_error.warnings;
4141
# running with the --secure-file-priv" in which case
4242
# an attempt to load the file using LOAD DATA LOCAL is made
4343
--error 0,1290
44-
eval load data infile '$log_warning' into table error_log
44+
eval load data infile '$log_warning' into table error_log character set latin1
4545
fields terminated by 'xykls37' escaped by ''
4646
ignore 1 lines
4747
(line)

mysql-test/include/common-tests.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CREATE TABLE t2 (
4444
UNIQUE fld1 (fld1),
4545
KEY fld3 (fld3),
4646
PRIMARY KEY (auto)
47-
);
47+
) CHARSET=latin1;
4848

4949
#
5050
# Populate table
@@ -1374,7 +1374,7 @@ create table t3 (
13741374
price2 double(11,0),
13751375
key (period),
13761376
key (name)
1377-
);
1377+
) CHARSET=latin1;
13781378

13791379
--disable_query_log
13801380
INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1001,"Iranizes",37,5987435,234724);
@@ -1506,7 +1506,7 @@ create table t4 (
15061506
companyname char(30) NOT NULL default '',
15071507
PRIMARY KEY (companynr),
15081508
UNIQUE KEY companyname(companyname)
1509-
) ENGINE=aria MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames';
1509+
) ENGINE=aria CHARSET=latin1 MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames';
15101510

15111511
--disable_query_log
15121512
INSERT INTO t4 (companynr, companyname) VALUES (29,'company 1');

mysql-test/include/default_charset.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
--disable_query_log
1111
SET @save_character_set_server= @@character_set_server;
1212
SET @save_collation_server= @@collation_server;
13-
set @@character_set_server="latin1";
14-
set @@collation_server="latin1_swedish_ci";
13+
set @@character_set_server=utf8mb4;
14+
set @@collation_server=utf8mb4_uca1400_ai_ci;
1515
--enable_query_log

mysql-test/include/default_mysqld.cnf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ disable-getopt-prefix-matching
2020
plugin-maturity=unknown
2121
open-files-limit= 1024
2222
local-infile
23-
character-set-server= latin1
23+
character-set-server= utf8mb4
24+
collation-server= utf8mb4_uca1400_ai_ci
2425

2526
# Increase default connect_timeout to avoid intermittent
2627
# disconnects when test servers are put under load see BUG#28359

mysql-test/include/func_str_ascii_checksum.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--echo # MDEV-10850 Wrong result for WHERE .. (f2=TO_BASE64('test') OR f2=TO_BASE64('TEST'))
55
--echo #
66

7-
--eval CREATE TABLE t1 (f1 VARCHAR(4), f2 VARCHAR(255), UNIQUE KEY k1 (f1,f2))
7+
--eval CREATE TABLE t1 (f1 VARCHAR(4), f2 VARCHAR(255), UNIQUE KEY k1 (f1,f2)) CHARSET=latin1
88
--eval INSERT INTO t1 VALUES ('test',$func('test')), ('TEST', $func('TEST'))
99
--eval SELECT * FROM t1 IGNORE INDEX(k1) WHERE f1='test' AND (f2= $func("test") OR f2= $func("TEST"))
1010
--eval SELECT * FROM t1 WHERE f1='test' AND (f2= $func("test") OR f2= $func("TEST"))

mysql-test/include/icp_tests.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ CREATE TABLE t3 (
216216
c1 TINYTEXT NOT NULL,
217217
i1 INT NOT NULL,
218218
KEY (c1(6),i1)
219-
);
219+
) CHARSET=latin1;
220220

221221
INSERT INTO t3 SELECT CONCAT('c-',1000+t2.a,'=w'), 1 FROM t2;
222222

@@ -691,7 +691,7 @@ set optimizer_switch= @tmp_778434;
691691
--echo # Bug#885168: ICP for one index + potential ORDER BY for another
692692
--echo #
693693

694-
CREATE TABLE t1 (a varchar(64), b varchar(10), INDEX(a), INDEX(b)) ;
694+
CREATE TABLE t1 (a varchar(64), b varchar(10), INDEX(a), INDEX(b)) CHARSET=latin1;
695695
INSERT INTO t1 VALUES
696696
('Ohio','Iowa'), ('k','d'), ('bdkpj','mbdkpjdanp'), ('d','xdmbdkpjda'),
697697
('fkxdmbdkpjdanpje','o'), ('f','Pennsylvan'), ('Virginia','ei');
@@ -722,10 +722,10 @@ DROP TABLE t1;
722722
--echo # Bug#886145: join with ICP + ORDER BY
723723
--echo #
724724

725-
CREATE TABLE t1 (b int NOT NULL, c int, a varchar(1024), PRIMARY KEY (b));
725+
CREATE TABLE t1 (b int NOT NULL, c int, a varchar(1024), PRIMARY KEY (b)) CHARSET=latin1;
726726
INSERT INTO t1 VALUES (1,4,'Ill');
727727

728-
CREATE TABLE t2 (a varchar(1024), KEY (a(512)));
728+
CREATE TABLE t2 (a varchar(1024), KEY (a(512))) CHARSET=latin1;
729729
INSERT INTO t2 VALUES
730730
('Ill'), ('eckqzsflbzaffti'), ('w'), ('she'), ('gxbwypqtjzwywwer'), ('w');
731731
insert into t2 select seq from seq_1_to_100;
@@ -930,7 +930,7 @@ CREATE TABLE t1 (
930930
c2 VARCHAR(2) ,
931931
INDEX idx1 (c2,c1(2)),
932932
INDEX idx2 (c2,c1(1))
933-
);
933+
) CHARSET=latin1;
934934

935935
INSERT INTO t1 (c1,c2) VALUES ('aa','x'), ('a' ,'y');
936936

mysql-test/include/index_merge_ror_cpk.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ drop table t1;
124124
--echo #
125125
--echo # Bug#50402 Optimizer producing wrong results when using Index Merge on InnoDB
126126
--echo #
127-
CREATE TABLE t1 (f1 INT, PRIMARY KEY (f1));
127+
CREATE TABLE t1 (f1 INT, PRIMARY KEY (f1)) CHARSET=latin1;
128128
INSERT INTO t1 VALUES (2);
129129
CREATE TABLE t2 (f1 INT, f2 INT, f3 char(1),
130-
PRIMARY KEY (f1), KEY (f2), KEY (f3) );
130+
PRIMARY KEY (f1), KEY (f2), KEY (f3)) CHARSET=latin1;
131131
INSERT INTO t2 VALUES (1, 1, 'h'), (2, 3, 'h'), (3, 2, ''), (4, 2, '');
132132

133133
SELECT t1.f1 FROM t1

mysql-test/include/mrr_tests.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ select b,filler from t3 where (b>='c-1011=w' and b<= 'c-1018=w') or
7575
drop table if exists t4;
7676
--enable_warnings
7777
create table t4 (a varchar(10), b int, c char(10), filler char(200),
78-
key idx1 (a, b, c));
78+
key idx1 (a, b, c)) charset=latin1;
7979

8080
# insert buffer_size * 1.5 all-NULL tuples
8181
insert into t4 (filler) select concat('NULL-', 15-a) from t2 order by a limit 15;

0 commit comments

Comments
 (0)