Skip to content

Commit 4a8ccb2

Browse files
marcalffdahlerlend
marcalff
authored and
dahlerlend
committed
BUG#27675959 CHANGE SYS SCHEMA TO USE UTF8MB4
The UTF8MB3 character set is deprecated in 8.0 Migrate sys schema to UTF8MB4. In particular: - change UTF8 (meaning UTF8MB3) character set to UTF8MB4 - change utf8_bin collations to utf8mb4_bin - change utf8_general_ci collation to the default (utf8_0900_ai_ci) Patch for file scripts/mysql_sys_schema.sql generated from upstream sys. Adjust all test cases accordingly.
1 parent f3a4173 commit 4a8ccb2

31 files changed

+270
-345
lines changed

‎mysql-test/r/information_schema.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_P
2323
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
2424
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
2525
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
26-
def sys utf8 utf8_general_ci NULL
26+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
2727
def test utf8mb4 utf8mb4_0900_ai_ci NULL
2828
select schema_name from information_schema.schemata ORDER BY schema_name;
2929
SCHEMA_NAME

‎mysql-test/r/information_schema_ci.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_P
2323
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
2424
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
2525
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
26-
def sys utf8 utf8_general_ci NULL
26+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
2727
def test utf8mb4 utf8mb4_0900_ai_ci NULL
2828
select schema_name from information_schema.schemata ORDER BY schema_name;
2929
SCHEMA_NAME

‎mysql-test/suite/engines/funcs/r/db_alter_character_set.result

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def information_schema utf8 utf8_general_ci NULL
5050
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
5151
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
5252
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
53-
def sys utf8 utf8_general_ci NULL
53+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
5454
def test utf8mb4 utf8mb4_0900_ai_ci NULL
5555
ALTER DATABASE d8 CHARACTER SET ascii;
5656
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -60,7 +60,7 @@ def information_schema utf8 utf8_general_ci NULL
6060
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
6161
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
6262
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
63-
def sys utf8 utf8_general_ci NULL
63+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
6464
def test utf8mb4 utf8mb4_0900_ai_ci NULL
6565
DROP DATABASE d8;
6666
CREATE DATABASE d8;
@@ -71,7 +71,7 @@ def information_schema utf8 utf8_general_ci NULL
7171
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
7272
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
7373
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
74-
def sys utf8 utf8_general_ci NULL
74+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
7575
def test utf8mb4 utf8mb4_0900_ai_ci NULL
7676
ALTER DATABASE d8 CHARACTER SET utf8;
7777
Warnings:
@@ -83,7 +83,7 @@ def information_schema utf8 utf8_general_ci NULL
8383
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
8484
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
8585
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
86-
def sys utf8 utf8_general_ci NULL
86+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
8787
def test utf8mb4 utf8mb4_0900_ai_ci NULL
8888
DROP DATABASE d8;
8989
CREATE DATABASE d8;
@@ -94,7 +94,7 @@ def information_schema utf8 utf8_general_ci NULL
9494
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
9595
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
9696
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
97-
def sys utf8 utf8_general_ci NULL
97+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
9898
def test utf8mb4 utf8mb4_0900_ai_ci NULL
9999
ALTER DATABASE d8 CHARACTER SET binary;
100100
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -104,7 +104,7 @@ def information_schema utf8 utf8_general_ci NULL
104104
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
105105
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
106106
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
107-
def sys utf8 utf8_general_ci NULL
107+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
108108
def test utf8mb4 utf8mb4_0900_ai_ci NULL
109109
DROP DATABASE d8;
110110
CREATE DATABASE d8;
@@ -115,7 +115,7 @@ def information_schema utf8 utf8_general_ci NULL
115115
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
116116
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
117117
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
118-
def sys utf8 utf8_general_ci NULL
118+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
119119
def test utf8mb4 utf8mb4_0900_ai_ci NULL
120120
ALTER DATABASE d8 CHARACTER SET swe7;
121121
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -125,7 +125,7 @@ def information_schema utf8 utf8_general_ci NULL
125125
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
126126
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
127127
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
128-
def sys utf8 utf8_general_ci NULL
128+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
129129
def test utf8mb4 utf8mb4_0900_ai_ci NULL
130130
DROP DATABASE d8;
131131
CREATE DATABASE d8;
@@ -136,7 +136,7 @@ def information_schema utf8 utf8_general_ci NULL
136136
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
137137
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
138138
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
139-
def sys utf8 utf8_general_ci NULL
139+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
140140
def test utf8mb4 utf8mb4_0900_ai_ci NULL
141141
ALTER DATABASE d8 CHARACTER SET cp1251;
142142
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -146,7 +146,7 @@ def information_schema utf8 utf8_general_ci NULL
146146
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
147147
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
148148
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
149-
def sys utf8 utf8_general_ci NULL
149+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
150150
def test utf8mb4 utf8mb4_0900_ai_ci NULL
151151
DROP DATABASE d8;
152152
CREATE DATABASE d8;
@@ -157,7 +157,7 @@ def information_schema utf8 utf8_general_ci NULL
157157
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
158158
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
159159
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
160-
def sys utf8 utf8_general_ci NULL
160+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
161161
def test utf8mb4 utf8mb4_0900_ai_ci NULL
162162
ALTER DATABASE d8 DEFAULT CHARACTER SET ascii;
163163
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -167,7 +167,7 @@ def information_schema utf8 utf8_general_ci NULL
167167
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
168168
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
169169
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
170-
def sys utf8 utf8_general_ci NULL
170+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
171171
def test utf8mb4 utf8mb4_0900_ai_ci NULL
172172
DROP DATABASE d8;
173173
CREATE DATABASE d8;
@@ -178,7 +178,7 @@ def information_schema utf8 utf8_general_ci NULL
178178
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
179179
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
180180
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
181-
def sys utf8 utf8_general_ci NULL
181+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
182182
def test utf8mb4 utf8mb4_0900_ai_ci NULL
183183
ALTER DATABASE d8 DEFAULT CHARACTER SET utf8;
184184
Warnings:
@@ -190,7 +190,7 @@ def information_schema utf8 utf8_general_ci NULL
190190
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
191191
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
192192
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
193-
def sys utf8 utf8_general_ci NULL
193+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
194194
def test utf8mb4 utf8mb4_0900_ai_ci NULL
195195
DROP DATABASE d8;
196196
CREATE DATABASE d8;
@@ -201,7 +201,7 @@ def information_schema utf8 utf8_general_ci NULL
201201
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
202202
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
203203
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
204-
def sys utf8 utf8_general_ci NULL
204+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
205205
def test utf8mb4 utf8mb4_0900_ai_ci NULL
206206
ALTER DATABASE d8 DEFAULT CHARACTER SET binary;
207207
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -211,7 +211,7 @@ def information_schema utf8 utf8_general_ci NULL
211211
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
212212
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
213213
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
214-
def sys utf8 utf8_general_ci NULL
214+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
215215
def test utf8mb4 utf8mb4_0900_ai_ci NULL
216216
DROP DATABASE d8;
217217
CREATE DATABASE d8;
@@ -222,7 +222,7 @@ def information_schema utf8 utf8_general_ci NULL
222222
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
223223
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
224224
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
225-
def sys utf8 utf8_general_ci NULL
225+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
226226
def test utf8mb4 utf8mb4_0900_ai_ci NULL
227227
ALTER DATABASE d8 DEFAULT CHARACTER SET swe7;
228228
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -232,7 +232,7 @@ def information_schema utf8 utf8_general_ci NULL
232232
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
233233
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
234234
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
235-
def sys utf8 utf8_general_ci NULL
235+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
236236
def test utf8mb4 utf8mb4_0900_ai_ci NULL
237237
DROP DATABASE d8;
238238
CREATE DATABASE d8;
@@ -243,7 +243,7 @@ def information_schema utf8 utf8_general_ci NULL
243243
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
244244
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
245245
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
246-
def sys utf8 utf8_general_ci NULL
246+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
247247
def test utf8mb4 utf8mb4_0900_ai_ci NULL
248248
ALTER DATABASE d8 DEFAULT CHARACTER SET cp1251;
249249
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -253,7 +253,7 @@ def information_schema utf8 utf8_general_ci NULL
253253
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
254254
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
255255
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
256-
def sys utf8 utf8_general_ci NULL
256+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
257257
def test utf8mb4 utf8mb4_0900_ai_ci NULL
258258
DROP DATABASE d8;
259259
CREATE DATABASE d8;
@@ -264,7 +264,7 @@ def information_schema utf8 utf8_general_ci NULL
264264
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
265265
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
266266
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
267-
def sys utf8 utf8_general_ci NULL
267+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
268268
def test utf8mb4 utf8mb4_0900_ai_ci NULL
269269
ALTER SCHEMA d8 CHARACTER SET ascii;
270270
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -274,7 +274,7 @@ def information_schema utf8 utf8_general_ci NULL
274274
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
275275
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
276276
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
277-
def sys utf8 utf8_general_ci NULL
277+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
278278
def test utf8mb4 utf8mb4_0900_ai_ci NULL
279279
DROP DATABASE d8;
280280
CREATE DATABASE d8;
@@ -285,7 +285,7 @@ def information_schema utf8 utf8_general_ci NULL
285285
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
286286
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
287287
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
288-
def sys utf8 utf8_general_ci NULL
288+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
289289
def test utf8mb4 utf8mb4_0900_ai_ci NULL
290290
ALTER SCHEMA d8 CHARACTER SET utf8;
291291
Warnings:
@@ -297,7 +297,7 @@ def information_schema utf8 utf8_general_ci NULL
297297
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
298298
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
299299
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
300-
def sys utf8 utf8_general_ci NULL
300+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
301301
def test utf8mb4 utf8mb4_0900_ai_ci NULL
302302
DROP DATABASE d8;
303303
CREATE DATABASE d8;
@@ -308,7 +308,7 @@ def information_schema utf8 utf8_general_ci NULL
308308
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
309309
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
310310
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
311-
def sys utf8 utf8_general_ci NULL
311+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
312312
def test utf8mb4 utf8mb4_0900_ai_ci NULL
313313
ALTER SCHEMA d8 CHARACTER SET binary;
314314
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -318,7 +318,7 @@ def information_schema utf8 utf8_general_ci NULL
318318
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
319319
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
320320
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
321-
def sys utf8 utf8_general_ci NULL
321+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
322322
def test utf8mb4 utf8mb4_0900_ai_ci NULL
323323
DROP DATABASE d8;
324324
CREATE DATABASE d8;
@@ -329,7 +329,7 @@ def information_schema utf8 utf8_general_ci NULL
329329
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
330330
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
331331
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
332-
def sys utf8 utf8_general_ci NULL
332+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
333333
def test utf8mb4 utf8mb4_0900_ai_ci NULL
334334
ALTER SCHEMA d8 CHARACTER SET swe7;
335335
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -339,7 +339,7 @@ def information_schema utf8 utf8_general_ci NULL
339339
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
340340
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
341341
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
342-
def sys utf8 utf8_general_ci NULL
342+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
343343
def test utf8mb4 utf8mb4_0900_ai_ci NULL
344344
DROP DATABASE d8;
345345
CREATE DATABASE d8;
@@ -350,7 +350,7 @@ def information_schema utf8 utf8_general_ci NULL
350350
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
351351
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
352352
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
353-
def sys utf8 utf8_general_ci NULL
353+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
354354
def test utf8mb4 utf8mb4_0900_ai_ci NULL
355355
ALTER SCHEMA d8 CHARACTER SET cp1251;
356356
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -360,7 +360,7 @@ def information_schema utf8 utf8_general_ci NULL
360360
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
361361
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
362362
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
363-
def sys utf8 utf8_general_ci NULL
363+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
364364
def test utf8mb4 utf8mb4_0900_ai_ci NULL
365365
DROP DATABASE d8;
366366
CREATE DATABASE d8;
@@ -371,7 +371,7 @@ def information_schema utf8 utf8_general_ci NULL
371371
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
372372
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
373373
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
374-
def sys utf8 utf8_general_ci NULL
374+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
375375
def test utf8mb4 utf8mb4_0900_ai_ci NULL
376376
ALTER SCHEMA d8 DEFAULT CHARACTER SET ascii;
377377
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -381,7 +381,7 @@ def information_schema utf8 utf8_general_ci NULL
381381
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
382382
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
383383
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
384-
def sys utf8 utf8_general_ci NULL
384+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
385385
def test utf8mb4 utf8mb4_0900_ai_ci NULL
386386
DROP DATABASE d8;
387387
CREATE DATABASE d8;
@@ -392,7 +392,7 @@ def information_schema utf8 utf8_general_ci NULL
392392
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
393393
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
394394
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
395-
def sys utf8 utf8_general_ci NULL
395+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
396396
def test utf8mb4 utf8mb4_0900_ai_ci NULL
397397
ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8;
398398
Warnings:
@@ -404,7 +404,7 @@ def information_schema utf8 utf8_general_ci NULL
404404
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
405405
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
406406
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
407-
def sys utf8 utf8_general_ci NULL
407+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
408408
def test utf8mb4 utf8mb4_0900_ai_ci NULL
409409
DROP DATABASE d8;
410410
CREATE DATABASE d8;
@@ -415,7 +415,7 @@ def information_schema utf8 utf8_general_ci NULL
415415
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
416416
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
417417
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
418-
def sys utf8 utf8_general_ci NULL
418+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
419419
def test utf8mb4 utf8mb4_0900_ai_ci NULL
420420
ALTER SCHEMA d8 DEFAULT CHARACTER SET binary;
421421
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -425,7 +425,7 @@ def information_schema utf8 utf8_general_ci NULL
425425
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
426426
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
427427
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
428-
def sys utf8 utf8_general_ci NULL
428+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
429429
def test utf8mb4 utf8mb4_0900_ai_ci NULL
430430
DROP DATABASE d8;
431431
CREATE DATABASE d8;
@@ -436,7 +436,7 @@ def information_schema utf8 utf8_general_ci NULL
436436
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
437437
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
438438
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
439-
def sys utf8 utf8_general_ci NULL
439+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
440440
def test utf8mb4 utf8mb4_0900_ai_ci NULL
441441
ALTER SCHEMA d8 DEFAULT CHARACTER SET swe7;
442442
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -446,7 +446,7 @@ def information_schema utf8 utf8_general_ci NULL
446446
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
447447
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
448448
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
449-
def sys utf8 utf8_general_ci NULL
449+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
450450
def test utf8mb4 utf8mb4_0900_ai_ci NULL
451451
DROP DATABASE d8;
452452
CREATE DATABASE d8;
@@ -457,7 +457,7 @@ def information_schema utf8 utf8_general_ci NULL
457457
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
458458
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
459459
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
460-
def sys utf8 utf8_general_ci NULL
460+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
461461
def test utf8mb4 utf8mb4_0900_ai_ci NULL
462462
ALTER SCHEMA d8 DEFAULT CHARACTER SET cp1251;
463463
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
@@ -467,6 +467,6 @@ def information_schema utf8 utf8_general_ci NULL
467467
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
468468
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
469469
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
470-
def sys utf8 utf8_general_ci NULL
470+
def sys utf8mb4 utf8mb4_0900_ai_ci NULL
471471
def test utf8mb4 utf8mb4_0900_ai_ci NULL
472472
DROP DATABASE d8;

0 commit comments

Comments
 (0)