Skip to content

Commit cacea31

Browse files
committed
MDEV-30621: Türkiye is the correct current country naming
As requested to the UN the country formerly known as Turkey is to be refered to as Türkiye. Reviewer: Alexander Barkov
1 parent eecd4f1 commit cacea31

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

mysql-test/suite/plugins/r/locales.result

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
SET names utf8;
12
select * from information_schema.locales;
23
ID NAME DESCRIPTION MAX_MONTH_NAME_LENGTH MAX_DAY_NAME_LENGTH DECIMAL_POINT THOUSAND_SEP ERROR_MESSAGE_LANGUAGE
34
0 en_US English - United States 9 9 . , english
@@ -52,7 +53,7 @@ ID NAME DESCRIPTION MAX_MONTH_NAME_LENGTH MAX_DAY_NAME_LENGTH DECIMAL_POINT THOU
5253
49 ta_IN Tamil - India 10 8 . , english
5354
50 te_IN Telugu - India 10 9 . , english
5455
51 th_TH Thai - Thailand 10 8 . , english
55-
52 tr_TR Turkish - Turkey 7 9 , . english
56+
52 tr_TR Turkish - Türkiye 7 9 , . english
5657
53 uk_UA Ukrainian - Ukraine 8 9 , . ukrainian
5758
54 ur_PK Urdu - Pakistan 6 6 . , english
5859
55 vi_VN Vietnamese - Vietnam 16 11 , . english
@@ -165,7 +166,7 @@ Id Name Description Error_Message_Language
165166
49 ta_IN Tamil - India english
166167
50 te_IN Telugu - India english
167168
51 th_TH Thai - Thailand english
168-
52 tr_TR Turkish - Turkey english
169+
52 tr_TR Turkish - Türkiye english
169170
53 uk_UA Ukrainian - Ukraine ukrainian
170171
54 ur_PK Urdu - Pakistan english
171172
55 vi_VN Vietnamese - Vietnam english

mysql-test/suite/plugins/t/locales.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'lo
22
{
33
--skip LOCALES plugin is not active
44
}
5+
SET names utf8;
56

67
select * from information_schema.locales;
78
show locales;

sql/sql_locale.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,7 +1919,7 @@ MY_LOCALE my_locale_th_TH
19191919
);
19201920
/***** LOCALE END th_TH *****/
19211921

1922-
/***** LOCALE BEGIN tr_TR: Turkish - Turkey *****/
1922+
/***** LOCALE BEGIN tr_TR: Turkish - Türkiye *****/
19231923
static const char *my_locale_month_names_tr_TR[13] =
19241924
{"Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık", NullS };
19251925
static const char *my_locale_ab_month_names_tr_TR[13] =
@@ -1940,7 +1940,7 @@ MY_LOCALE my_locale_tr_TR
19401940
(
19411941
52,
19421942
"tr_TR",
1943-
"Turkish - Turkey",
1943+
"Turkish - Türkiye",
19441944
FALSE,
19451945
&my_locale_typelib_month_names_tr_TR,
19461946
&my_locale_typelib_ab_month_names_tr_TR,

0 commit comments

Comments
 (0)