Skip to content

Commit 9bc47e4

Browse files
committed
WL #14307: Add collations for languages currently covered by
other language specific collations. Added new collations Norwegian (identical to Danish with Case First OFF) utf8mb4_nb_0900_ai_ci, utf8mb4_nb_0900_as_cs utf8mb4_nn_0900_ai_ci, utf8mb4_nn_0900_as_cs Serbian with Latin characters (same as Croatian) utf8mb4_sr_latn_0900_ai_ci, utf8mb4_sr_latn_0900_as_cs Bosnian with Latin characters (same as Croatian) utf8mb4_bs_0900_ai_ci, utf8mb4_bs_0900_as_cs Bulgarian (same as Russian) utf8mb4_bg_0900_ai_ci, utf8mb4_bg_0900_as_cs Galician (same as standard Spanish) utf8mb4_gl_0900_ai_ci, utf8mb4_gl_0900_as_cs Mongolian written with Cyrillic letters (same as Russian) utf8mb4_mn_cyrl_0900_ai_ci, utf8mb4_mn_cyrl_0900_as_cs Change-Id: I4ad6596856377719da9e8c387ddd27f3dd58f5d6
1 parent 16c7f5c commit 9bc47e4

25 files changed

+57507
-9
lines changed

mysql-test/r/ctype_ldml.result

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,20 @@ utf8mb4_ru_0900_ai_ci utf8mb4 306
543543
utf8mb4_ru_0900_as_cs utf8mb4 307
544544
utf8mb4_zh_0900_as_cs utf8mb4 308
545545
utf8mb4_0900_bin utf8mb4 309
546+
utf8mb4_nb_0900_ai_ci utf8mb4 310
547+
utf8mb4_nb_0900_as_cs utf8mb4 311
548+
utf8mb4_nn_0900_ai_ci utf8mb4 312
549+
utf8mb4_nn_0900_as_cs utf8mb4 313
550+
utf8mb4_sr_latn_0900_ai_ci utf8mb4 314
551+
utf8mb4_sr_latn_0900_as_cs utf8mb4 315
552+
utf8mb4_bs_0900_ai_ci utf8mb4 316
553+
utf8mb4_bs_0900_as_cs utf8mb4 317
554+
utf8mb4_bg_0900_ai_ci utf8mb4 318
555+
utf8mb4_bg_0900_as_cs utf8mb4 319
556+
utf8mb4_gl_0900_ai_ci utf8mb4 320
557+
utf8mb4_gl_0900_as_cs utf8mb4 321
558+
utf8mb4_mn_cyrl_0900_ai_ci utf8mb4 322
559+
utf8mb4_mn_cyrl_0900_as_cs utf8mb4 323
546560
utf8mb4_test_ci utf8mb4 326
547561
utf16_test_ci utf16 327
548562
utf8mb4_test_400_ci utf8mb4 328

mysql-test/r/ctype_unicode900.result

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4436,6 +4436,38 @@ codepoint
44364436
1D2B
44374437
045B
44384438
DROP TABLE t1;
4439+
CREATE TABLE t1 (
4440+
codepoint CHAR(1) CHARSET utf16 NOT NULL,
4441+
glyph CHAR(2) CHARSET utf8mb4 COLLATE utf8mb4_mn_cyrl_0900_ai_ci NOT NULL,
4442+
description VARCHAR(64) NOT NULL);
4443+
INSERT INTO t1 (codepoint, glyph, description) VALUES
4444+
(0x041E, 'О', 'CYRILLIC CAPITAL LETTER O'),
4445+
(0x04E8, 'Ө', 'CYRILLIC CAPITAL LETTER BARRED O'),
4446+
(0x041F, 'П', 'CYRILLIC CAPITAL LETTER PE '),
4447+
(0x043E, 'о', 'CYRILLIC SMALL LETTER O'),
4448+
(0x04E9, 'ө', 'CYRILLIC SMALL LETTER BARRED O'),
4449+
(0x043F, 'п', 'CYRILLIC SMALL LETTER PE'),
4450+
(0x0423, 'У', 'CYRILLIC CAPITAL LETTER U '),
4451+
(0x04AE, 'Ү', 'CYRILLIC CAPITAL LETTER STRAIGHT U '),
4452+
(0x0424, 'Ф', 'CYRILLIC CAPITAL LETTER EF '),
4453+
(0x0443, 'у', 'CYRILLIC SMALL LETTER U '),
4454+
(0x04AF, 'ү', 'CYRILLIC SMALL LETTER STRAIGHT U'),
4455+
(0x0444, 'ф', 'CYRILLIC SMALL LETTER EF');
4456+
SELECT HEX(codepoint), codepoint, glyph, description FROM t1 ORDER BY glyph, codepoint;
4457+
HEX(codepoint) codepoint glyph description
4458+
041E О О CYRILLIC CAPITAL LETTER O
4459+
043E о о CYRILLIC SMALL LETTER O
4460+
04E8 Ө Ө CYRILLIC CAPITAL LETTER BARRED O
4461+
04E9 ө ө CYRILLIC SMALL LETTER BARRED O
4462+
041F П П CYRILLIC CAPITAL LETTER PE
4463+
043F п п CYRILLIC SMALL LETTER PE
4464+
0423 У У CYRILLIC CAPITAL LETTER U
4465+
0443 у у CYRILLIC SMALL LETTER U
4466+
04AE Ү Ү CYRILLIC CAPITAL LETTER STRAIGHT U
4467+
04AF ү ү CYRILLIC SMALL LETTER STRAIGHT U
4468+
0424 Ф Ф CYRILLIC CAPITAL LETTER EF
4469+
0444 ф ф CYRILLIC SMALL LETTER EF
4470+
DROP TABLE t1;
44394471
#
44404472
# End of 8.0 tests
44414473
#

mysql-test/r/ctype_unicode900_as_cs.result

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2562,6 +2562,38 @@ codepoint
25622562
1D2B
25632563
045B
25642564
DROP TABLE t1;
2565+
CREATE TABLE t1 (
2566+
codepoint CHAR(1) CHARSET utf16 NOT NULL,
2567+
glyph CHAR(2) CHARSET utf8mb4 COLLATE utf8mb4_mn_cyrl_0900_as_cs NOT NULL,
2568+
description VARCHAR(64) NOT NULL);
2569+
INSERT INTO t1 (codepoint, glyph, description) VALUES
2570+
(0x041E, 'О', 'CYRILLIC CAPITAL LETTER O'),
2571+
(0x04E8, 'Ө', 'CYRILLIC CAPITAL LETTER BARRED O'),
2572+
(0x041F, 'П', 'CYRILLIC CAPITAL LETTER PE '),
2573+
(0x043E, 'о', 'CYRILLIC SMALL LETTER O'),
2574+
(0x04E9, 'ө', 'CYRILLIC SMALL LETTER BARRED O'),
2575+
(0x043F, 'п', 'CYRILLIC SMALL LETTER PE'),
2576+
(0x0423, 'У', 'CYRILLIC CAPITAL LETTER U '),
2577+
(0x04AE, 'Ү', 'CYRILLIC CAPITAL LETTER STRAIGHT U '),
2578+
(0x0424, 'Ф', 'CYRILLIC CAPITAL LETTER EF '),
2579+
(0x0443, 'у', 'CYRILLIC SMALL LETTER U '),
2580+
(0x04AF, 'ү', 'CYRILLIC SMALL LETTER STRAIGHT U'),
2581+
(0x0444, 'ф', 'CYRILLIC SMALL LETTER EF');
2582+
SELECT HEX(codepoint), codepoint, glyph, description FROM t1 ORDER BY glyph, codepoint;
2583+
HEX(codepoint) codepoint glyph description
2584+
043E о о CYRILLIC SMALL LETTER O
2585+
041E О О CYRILLIC CAPITAL LETTER O
2586+
04E9 ө ө CYRILLIC SMALL LETTER BARRED O
2587+
04E8 Ө Ө CYRILLIC CAPITAL LETTER BARRED O
2588+
043F п п CYRILLIC SMALL LETTER PE
2589+
041F П П CYRILLIC CAPITAL LETTER PE
2590+
0443 у у CYRILLIC SMALL LETTER U
2591+
0423 У У CYRILLIC CAPITAL LETTER U
2592+
04AF ү ү CYRILLIC SMALL LETTER STRAIGHT U
2593+
04AE Ү Ү CYRILLIC CAPITAL LETTER STRAIGHT U
2594+
0444 ф ф CYRILLIC SMALL LETTER EF
2595+
0424 Ф Ф CYRILLIC CAPITAL LETTER EF
2596+
DROP TABLE t1;
25652597
#
25662598
# End of 5.8 tests
25672599
#

0 commit comments

Comments
 (0)