Skip to content

Commit edf71fd

Browse files
committed
MDEV-9928 LC_TIME_NAMES=de_AT; unusual name for february
s/Feber/Februar/
1 parent 9c64735 commit edf71fd

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

mysql-test/r/locale.result

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,14 @@ SELECT DATE_FORMAT('2001-01-07', '%w %a %W');
9090
DATE_FORMAT('2001-01-07', '%w %a %W')
9191
0 Du Duminică
9292
End of 5.4 tests
93+
SET NAMES utf8;
94+
SET lc_time_names=de_AT;
95+
SELECT monthname('2001-01-01');
96+
monthname('2001-01-01')
97+
Jänner
98+
SELECT monthname('2001-02-01');
99+
monthname('2001-02-01')
100+
Februar
101+
SELECT monthname('2001-03-01');
102+
monthname('2001-03-01')
103+
März

mysql-test/t/locale.test

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,12 @@ SELECT DATE_FORMAT('2001-01-05', '%w %a %W');
5454
SELECT DATE_FORMAT('2001-01-06', '%w %a %W');
5555
SELECT DATE_FORMAT('2001-01-07', '%w %a %W');
5656
--echo End of 5.4 tests
57+
58+
#
59+
# MDEV-9928 LC_TIME_NAMES=de_AT; unusual name for february
60+
#
61+
SET NAMES utf8;
62+
SET lc_time_names=de_AT;
63+
SELECT monthname('2001-01-01');
64+
SELECT monthname('2001-02-01');
65+
SELECT monthname('2001-03-01');

sql/sql_locale.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ MY_LOCALE my_locale_da_DK
426426

427427
/***** LOCALE BEGIN de_AT: German - Austria *****/
428428
static const char *my_locale_month_names_de_AT[13] =
429-
{"Jänner","Feber","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember", NullS };
429+
{"Jänner","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember", NullS };
430430
static const char *my_locale_ab_month_names_de_AT[13] =
431431
{"Jän","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez", NullS };
432432
static const char *my_locale_day_names_de_AT[8] =

0 commit comments

Comments
 (0)