Skip to content
/ server Public

Commit f15c87f

Browse files
forkfunforkfun
committed
Fix locale data to align with Unicode CLDR
-updated standardized day names, month names, and abbreviations across multiple locales, data from from https://unicode.org/cldr/charts/48/summary/root.html -added more locale (for Oracle compatibility) Thanks to Mahmoud Khaled Rashad for fixing Urdu parsing
1 parent 576c47f commit f15c87f

21 files changed

+1421
-331
lines changed

‎mysql-test/main/ctype_ucs.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ HEX(MONTHNAME(19700101))
15261526
044F043D043204300440044C
15271527
SELECT HEX(DAYNAME(19700101));
15281528
HEX(DAYNAME(19700101))
1529-
0427043504420432043504400433
1529+
0447043504420432043504400433
15301530
SET character_set_connection=latin1;
15311531
#
15321532
# Bug#52120 create view cause Assertion failed: 0, file .\item_subselect.cc, line 817

‎mysql-test/main/ctype_utf8.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ insert into t1 values (date_format('2004-02-02','%a'));
115115
select hex(s1), s1 from t1;
116116
hex(s1) s1
117117
C6C5D7D2C1CCD8 февраль
118-
E6C5D7 Фев
119-
F0CFCEC5C4C5CCD8CEC9CB Понедельник
120-
F0CEC4 Пнд
118+
C6C5D7D22E февр.
119+
D0CFCEC5C4C5CCD8CEC9CB понедельник
120+
D0CE пн
121121
drop table t1;
122122
set LC_TIME_NAMES='en_US';
123123
set names koi8r;

‎mysql-test/main/ctype_utf8mb4.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ insert into t1 values (date_format('2004-02-02','%a'));
115115
select hex(s1), s1 from t1;
116116
hex(s1) s1
117117
C6C5D7D2C1CCD8 февраль
118-
E6C5D7 Фев
119-
F0CFCEC5C4C5CCD8CEC9CB Понедельник
120-
F0CEC4 Пнд
118+
C6C5D7D22E февр.
119+
D0CFCEC5C4C5CCD8CEC9CB понедельник
120+
D0CE пн
121121
drop table t1;
122122
set LC_TIME_NAMES='en_US';
123123
set names koi8r;

‎mysql-test/main/ctype_utf8mb4_heap.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ insert into t1 values (date_format('2004-02-02','%W'));
149149
insert into t1 values (date_format('2004-02-02','%a'));
150150
select hex(s1), s1 from t1;
151151
hex(s1) s1
152+
C6C5D7D22E февр.
152153
C6C5D7D2C1CCD8 февраль
153-
E6C5D7 Фев
154-
F0CEC4 Пнд
155-
F0CFCEC5C4C5CCD8CEC9CB Понедельник
154+
D0CE пн
155+
D0CFCEC5C4C5CCD8CEC9CB понедельник
156156
drop table t1;
157157
set LC_TIME_NAMES='en_US';
158158
set names koi8r;

‎mysql-test/main/ctype_utf8mb4_innodb.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ insert into t1 values (date_format('2004-02-02','%W'));
149149
insert into t1 values (date_format('2004-02-02','%a'));
150150
select hex(s1), s1 from t1;
151151
hex(s1) s1
152+
C6C5D7D22E февр.
152153
C6C5D7D2C1CCD8 февраль
153-
E6C5D7 Фев
154-
F0CEC4 Пнд
155-
F0CFCEC5C4C5CCD8CEC9CB Понедельник
154+
D0CE пн
155+
D0CFCEC5C4C5CCD8CEC9CB понедельник
156156
drop table t1;
157157
set LC_TIME_NAMES='en_US';
158158
set names koi8r;

‎mysql-test/main/ctype_utf8mb4_myisam.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ insert into t1 values (date_format('2004-02-02','%W'));
149149
insert into t1 values (date_format('2004-02-02','%a'));
150150
select hex(s1), s1 from t1;
151151
hex(s1) s1
152+
C6C5D7D22E февр.
152153
C6C5D7D2C1CCD8 февраль
153-
E6C5D7 Фев
154-
F0CEC4 Пнд
155-
F0CFCEC5C4C5CCD8CEC9CB Понедельник
154+
D0CE пн
155+
D0CFCEC5C4C5CCD8CEC9CB понедельник
156156
drop table t1;
157157
set LC_TIME_NAMES='en_US';
158158
set names koi8r;

‎mysql-test/main/date_formats.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ set lc_time_names=ru_RU;
440440
set names koi8r;
441441
select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
442442
date_format('2004-01-01','%W (%a), %e %M (%b) %Y')
443-
������� (���), 1 ������ (���) 2004
443+
������� (��), 1 ������ (���.) 2004
444444
set lc_time_names=de_DE;
445445
set names latin1;
446446
select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

‎mysql-test/main/func_str.result‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2930,7 +2930,10 @@ format(12345678901234567890.123, 3, 'en_US')
29302930
12,345,678,901,234,567,890.123
29312931
SELECT format(12345678901234567890.123, 3, 'it_CH');
29322932
format(12345678901234567890.123, 3, 'it_CH')
2933-
12'345'678'901'234'567'890,123
2933+
12'345'678'901'234'567'890.123
2934+
SELECT format(12345678901234567890.123, 3, 'it_IT');
2935+
format(12345678901234567890.123, 3, 'it_IT')
2936+
12345678901234567890,123
29342937
SELECT format(12345678901234567890.123, 3, 'ru_RU');
29352938
format(12345678901234567890.123, 3, 'ru_RU')
29362939
12 345 678 901 234 567 890,123
@@ -2955,7 +2958,7 @@ be_BY 12.345.678.901.234.567.890,123
29552958
de_DE 12.345.678.901.234.567.890,123
29562959
en_IN 1,23,45,67,89,01,23,45,67,890.123
29572960
en_US 12,345,678,901,234,567,890.123
2958-
it_CH 12'345'678'901'234'567'890,123
2961+
it_CH 12'345'678'901'234'567'890.123
29592962
ru_RU 12 345 678 901 234 567 890,123
29602963
ta_IN 1,23,45,67,89,01,23,45,67,890.123
29612964
SELECT fmt, format(12345678901234567890.123, 0, fmt) FROM t1 ORDER BY fmt;
@@ -2977,7 +2980,7 @@ be_BY 12.345.678.901.234.567.890,000
29772980
de_DE 12.345.678.901.234.567.890,000
29782981
en_IN 1,23,45,67,89,01,23,45,67,890.000
29792982
en_US 12,345,678,901,234,567,890.000
2980-
it_CH 12'345'678'901'234'567'890,000
2983+
it_CH 12'345'678'901'234'567'890.000
29812984
ru_RU 12 345 678 901 234 567 890,000
29822985
ta_IN 1,23,45,67,89,01,23,45,67,890.000
29832986
SELECT fmt, format(-12345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
@@ -2988,7 +2991,7 @@ be_BY -12.345.678.901.234.567.890,000
29882991
de_DE -12.345.678.901.234.567.890,000
29892992
en_IN -1,23,45,67,89,01,23,45,67,890.000
29902993
en_US -12,345,678,901,234,567,890.000
2991-
it_CH -12'345'678'901'234'567'890,000
2994+
it_CH -12'345'678'901'234'567'890.000
29922995
ru_RU -12 345 678 901 234 567 890,000
29932996
ta_IN -1,23,45,67,89,01,23,45,67,890.000
29942997
SELECT fmt, format(-02345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
@@ -2999,7 +3002,7 @@ be_BY -2.345.678.901.234.567.890,000
29993002
de_DE -2.345.678.901.234.567.890,000
30003003
en_IN -23,45,67,89,01,23,45,67,890.000
30013004
en_US -2,345,678,901,234,567,890.000
3002-
it_CH -2'345'678'901'234'567'890,000
3005+
it_CH -2'345'678'901'234'567'890.000
30033006
ru_RU -2 345 678 901 234 567 890,000
30043007
ta_IN -23,45,67,89,01,23,45,67,890.000
30053008
SELECT fmt, format(-00345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
@@ -3010,7 +3013,7 @@ be_BY -345.678.901.234.567.890,000
30103013
de_DE -345.678.901.234.567.890,000
30113014
en_IN -3,45,67,89,01,23,45,67,890.000
30123015
en_US -345,678,901,234,567,890.000
3013-
it_CH -345'678'901'234'567'890,000
3016+
it_CH -345'678'901'234'567'890.000
30143017
ru_RU -345 678 901 234 567 890,000
30153018
ta_IN -3,45,67,89,01,23,45,67,890.000
30163019
SELECT fmt, format(-00045678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
@@ -3021,7 +3024,7 @@ be_BY -45.678.901.234.567.890,000
30213024
de_DE -45.678.901.234.567.890,000
30223025
en_IN -45,67,89,01,23,45,67,890.000
30233026
en_US -45,678,901,234,567,890.000
3024-
it_CH -45'678'901'234'567'890,000
3027+
it_CH -45'678'901'234'567'890.000
30253028
ru_RU -45 678 901 234 567 890,000
30263029
ta_IN -45,67,89,01,23,45,67,890.000
30273030
DROP TABLE t1;

‎mysql-test/main/func_str.test‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,6 +1626,7 @@ SELECT format(12345678901234567890.123, 3, 'en_IN');
16261626
SELECT format(12345678901234567890.123, 3, 'en_US');
16271627
--enable_cursor_protocol
16281628
SELECT format(12345678901234567890.123, 3, 'it_CH');
1629+
SELECT format(12345678901234567890.123, 3, 'it_IT');
16291630
SELECT format(12345678901234567890.123, 3, 'ru_RU');
16301631
#check after fix MDEV-31512
16311632
--disable_cursor_protocol

‎mysql-test/main/locale.result‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,25 @@ SET NAMES utf8;
6464
SET lc_time_names=ro_RO;
6565
SELECT DATE_FORMAT('2001-01-01', '%w %a %W');
6666
DATE_FORMAT('2001-01-01', '%w %a %W')
67-
1 Lu Luni
67+
1 lun. luni
6868
SELECT DATE_FORMAT('2001-01-02', '%w %a %W');
6969
DATE_FORMAT('2001-01-02', '%w %a %W')
70-
2 Ma Marţi
70+
2 mar. marți
7171
SELECT DATE_FORMAT('2001-01-03', '%w %a %W');
7272
DATE_FORMAT('2001-01-03', '%w %a %W')
73-
3 Mi Miercuri
73+
3 mie. miercuri
7474
SELECT DATE_FORMAT('2001-01-04', '%w %a %W');
7575
DATE_FORMAT('2001-01-04', '%w %a %W')
76-
4 Jo Joi
76+
4 joi joi
7777
SELECT DATE_FORMAT('2001-01-05', '%w %a %W');
7878
DATE_FORMAT('2001-01-05', '%w %a %W')
79-
5 Vi Vineri
79+
5 vin. vineri
8080
SELECT DATE_FORMAT('2001-01-06', '%w %a %W');
8181
DATE_FORMAT('2001-01-06', '%w %a %W')
82-
6 Sâ Sâmbătă
82+
6 sâm. sâmbătă
8383
SELECT DATE_FORMAT('2001-01-07', '%w %a %W');
8484
DATE_FORMAT('2001-01-07', '%w %a %W')
85-
0 Du Duminică
85+
0 dum. duminică
8686
End of 5.4 tests
8787
SET NAMES utf8;
8888
SET lc_time_names=de_AT;
@@ -202,7 +202,7 @@ DATE_FORMAT('2001-01-06', '%w %a %W')
202202
6 Sa Samstag
203203
SELECT DATE_FORMAT('2001-09-01', '%c %b %M');
204204
DATE_FORMAT('2001-09-01', '%c %b %M')
205-
9 Sep September
205+
9 Sept September
206206
SELECT DATE_FORMAT('2010-03-23 11:00:00','%h %p');
207207
DATE_FORMAT('2010-03-23 11:00:00','%h %p')
208208
11 AM
@@ -211,7 +211,7 @@ DATE_FORMAT('2010-03-23 13:00:00','%h %p')
211211
01 PM
212212
SELECT format(123456789,2,'rm_CH');
213213
format(123456789,2,'rm_CH')
214-
123'456'789,00
214+
123'456'789.00
215215
SET lc_messages=rm_CH;
216216
SELECT * FROM non_existent;
217217
ERROR 42S02: Table 'test.non_existent' doesn't exist
@@ -229,7 +229,7 @@ format(123456789,2) as b,
229229
format(123456789,2,'rm_CH') as b1;
230230
select * from v1;
231231
a a1 b b1
232-
10 Oct October 10 Окт октябрь 123,456,789.00 123'456'789,00
232+
10 Oct October 10 окт. октябрь 123,456,789.00 123'456'789.00
233233
show create view v1;
234234
View Create View character_set_client collation_connection
235235
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1` utf8mb3 utf8mb3_uca1400_ai_ci
@@ -239,25 +239,25 @@ drop view v1;
239239
#
240240
select date_format('2001-01-01', '%w %a %W', 'ro_RO');
241241
date_format('2001-01-01', '%w %a %W', 'ro_RO')
242-
1 Lu Luni
242+
1 lun. luni
243243
select date_format('2001-01-03', '%w %a %W', 'ro_RO');
244244
date_format('2001-01-03', '%w %a %W', 'ro_RO')
245-
3 Mi Miercuri
245+
3 mie. miercuri
246246
select date_format('2001-01-05', '%w %a %W', 'ro_RO');
247247
date_format('2001-01-05', '%w %a %W', 'ro_RO')
248-
5 Vi Vineri
248+
5 vin. vineri
249249
select date_format('2001-01-07', '%w %a %W', 'ro_RO');
250250
date_format('2001-01-07', '%w %a %W', 'ro_RO')
251-
0 Du Duminică
251+
0 dum. duminică
252252
select date_format('2001-01-01', '%w %a %W', 'de_AT');
253253
date_format('2001-01-01', '%w %a %W', 'de_AT')
254-
1 Mon Montag
254+
1 Mo Montag
255255
select date_format('2001-02-01', '%w %a %W', 'de_AT');
256256
date_format('2001-02-01', '%w %a %W', 'de_AT')
257-
4 Don Donnerstag
257+
4 Do Donnerstag
258258
select date_format('2001-03-01', '%w %a %W', 'de_AT');
259259
date_format('2001-03-01', '%w %a %W', 'de_AT')
260-
4 Don Donnerstag
260+
4 Do Donnerstag
261261
select date_format('2001-01-01', '%w %a %W', 'en_US');
262262
date_format('2001-01-01', '%w %a %W', 'en_US')
263263
1 Mon Monday
@@ -299,7 +299,7 @@ date_format('2001-01-06', '%w %a %W', 'de_CH')
299299
6 Sa Samstag
300300
select date_format('2001-09-01', '%c %b %M', 'de_CH');
301301
date_format('2001-09-01', '%c %b %M', 'de_CH')
302-
9 Sep September
302+
9 Sept September
303303
#
304304
# MDEV-30630 locale: Chinese error message for ZH_CN
305305
#
@@ -347,7 +347,7 @@ d MONTH_ABBR MONTHNAME(d)
347347
2001-06-01 ივნ ივნისი
348348
2001-07-01 ივლ ივლისი
349349
2001-08-01 აგვ აგვისტო
350-
2001-09-01 სექტ სექტემბერი
350+
2001-09-01 სექ სექტემბერი
351351
2001-10-01 ოქტ ოქტომბერი
352352
2001-11-01 ნოე ნოემბერი
353353
2001-12-01 დეკ დეკემბერი
@@ -362,7 +362,7 @@ d WEEKDAY(d) DAY_ABBR DAYNAME(d)
362362
2001-01-04 3 ხუთშ ხუთშაბათი
363363
2001-01-05 4 პარ პარასკევი
364364
2001-01-06 5 შაბ შაბათი
365-
2001-01-07 6 კვ კვირა
365+
2001-01-07 6 კვი კვირა
366366
DROP TABLE t1;
367367
SET lc_time_names=DEFAULT;
368368
SET lc_messages=DEFAULT;

0 commit comments

Comments
 (0)