1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-30621: Türkiye is the correct current country naming

Browse Source 
As requested to the UN the country formerly known as Turkey is
to be refered to as Türkiye.

Reviewer: Alexander Barkov
This commit is contained in:
Daniel Black 2023-02-09 12:49:17 +11:00
parent eecd4f1459
commit cacea31687
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/plugins/r/locales.result
View File

@ -1,3 +1,4 @@
SET names utf8;
select * from information_schema.locales; select * from information_schema.locales;
ID NAME DESCRIPTION MAX_MONTH_NAME_LENGTH MAX_DAY_NAME_LENGTH DECIMAL_POINT THOUSAND_SEP ERROR_MESSAGE_LANGUAGE ID NAME DESCRIPTION MAX_MONTH_NAME_LENGTH MAX_DAY_NAME_LENGTH DECIMAL_POINT THOUSAND_SEP ERROR_MESSAGE_LANGUAGE
0 en_US English - United States 9 9 . , english 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
49 ta_IN Tamil - India 10 8 . , english 49 ta_IN Tamil - India 10 8 . , english
50 te_IN Telugu - India 10 9 . , english 50 te_IN Telugu - India 10 9 . , english
51 th_TH Thai - Thailand 10 8 . , english 51 th_TH Thai - Thailand 10 8 . , english
52 tr_TR Turkish - Turkey 7 9 , . english 52 tr_TR Turkish - Türkiye 7 9 , . english
53 uk_UA Ukrainian - Ukraine 8 9 , . ukrainian 53 uk_UA Ukrainian - Ukraine 8 9 , . ukrainian
54 ur_PK Urdu - Pakistan 6 6 . , english 54 ur_PK Urdu - Pakistan 6 6 . , english
55 vi_VN Vietnamese - Vietnam 16 11 , . english 55 vi_VN Vietnamese - Vietnam 16 11 , . english
@ -165,7 +166,7 @@ Id Name Description Error_Message_Language
49 ta_IN Tamil - India english 49 ta_IN Tamil - India english
50 te_IN Telugu - India english 50 te_IN Telugu - India english
51 th_TH Thai - Thailand english 51 th_TH Thai - Thailand english
52 tr_TR Turkish - Turkey english 52 tr_TR Turkish - Türkiye english
53 uk_UA Ukrainian - Ukraine ukrainian 53 uk_UA Ukrainian - Ukraine ukrainian
54 ur_PK Urdu - Pakistan english 54 ur_PK Urdu - Pakistan english
55 vi_VN Vietnamese - Vietnam english 55 vi_VN Vietnamese - Vietnam english

1
mysql-test/suite/plugins/t/locales.test
View File

@ -2,6 +2,7 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'lo
{ {
--skip LOCALES plugin is not active --skip LOCALES plugin is not active
} }
SET names utf8;
select * from information_schema.locales; select * from information_schema.locales;
show locales; show locales;

4
sql/sql_locale.cc
View File

@ -1919,7 +1919,7 @@ MY_LOCALE my_locale_th_TH
); );
/***** LOCALE END th_TH *****/ /***** LOCALE END th_TH *****/
/***** LOCALE BEGIN tr_TR: Turkish - Turkey *****/ /***** LOCALE BEGIN tr_TR: Turkish - Türkiye *****/
static const char *my_locale_month_names_tr_TR[13] = static const char *my_locale_month_names_tr_TR[13] =
{"Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık", NullS }; {"Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık", NullS };
static const char *my_locale_ab_month_names_tr_TR[13] = static const char *my_locale_ab_month_names_tr_TR[13] =
@ -1940,7 +1940,7 @@ MY_LOCALE my_locale_tr_TR
( (
52, 52,
"tr_TR", "tr_TR",
"Turkish - Turkey", "Turkish - Türkiye",
FALSE, FALSE,
&my_locale_typelib_month_names_tr_TR, &my_locale_typelib_month_names_tr_TR,
&my_locale_typelib_ab_month_names_tr_TR, &my_locale_typelib_ab_month_names_tr_TR,