Skip to content

M
MariaDB
Commit 483ddb56 authored by Daniel Black's avatar Daniel Black
Browse files
Options

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.
parent cafba876
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 23 deletions
mysql-test/include/world.inc
View file @ 483ddb56
...@@ -214,7 +214,7 @@ INSERT IGNORE INTO Country VALUES ...@@ -214,7 +214,7 @@ INSERT IGNORE INTO Country VALUES
('TCD','Chad',1284000.00,7651000,3337), ('TCD','Chad',1284000.00,7651000,3337),
('CZE','Czech Republic',78866.00,10278100,3339), ('CZE','Czech Republic',78866.00,10278100,3339),
('TUN','Tunisia',163610.00,9586000,3349), ('TUN','Tunisia',163610.00,9586000,3349),
('TUR','Turkey',774815.00,66591000,3358), ('TUR','Türkiye',774815.00,66591000,3358),
('TKM','Turkmenistan',488100.00,4459000,3419), ('TKM','Turkmenistan',488100.00,4459000,3419),
('TCA','Turks and Caicos Islands',430.00,17000,3423), ('TCA','Turks and Caicos Islands',430.00,17000,3423),
('TUV','Tuvalu',26.00,12000,3424), ('TUV','Tuvalu',26.00,12000,3424),
......
mysql-test/main/join_cache.result
View file @ 483ddb56
...@@ -1000,7 +1000,7 @@ Taiwan NULL ...@@ -1000,7 +1000,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -1200,7 +1200,7 @@ Taiwan NULL ...@@ -1200,7 +1200,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -1459,7 +1459,7 @@ Taiwan NULL ...@@ -1459,7 +1459,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -1656,7 +1656,7 @@ Taiwan NULL ...@@ -1656,7 +1656,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -1853,7 +1853,7 @@ Taiwan NULL ...@@ -1853,7 +1853,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -2050,7 +2050,7 @@ Taiwan NULL ...@@ -2050,7 +2050,7 @@ Taiwan NULL
Tanzania NULL Tanzania NULL
Thailand NULL Thailand NULL
Czech Republic NULL Czech Republic NULL
Turkey NULL Türkiye NULL
Uganda NULL Uganda NULL
Ukraine NULL Ukraine NULL
Hungary NULL Hungary NULL
...@@ -2694,7 +2694,7 @@ SELECT City.Name, Country.Name FROM City,Country ...@@ -2694,7 +2694,7 @@ SELECT City.Name, Country.Name FROM City,Country
WHERE City.Country=Country.Code AND City.Population > 3000000; WHERE City.Country=Country.Code AND City.Population > 3000000;
Name Name Name Name
Alexandria Egypt Alexandria Egypt
Ankara Turkey Ankara Türkiye
Baghdad Iraq Baghdad Iraq
Bangkok Thailand Bangkok Thailand
Berlin Germany Berlin Germany
...@@ -2708,7 +2708,7 @@ Delhi India ...@@ -2708,7 +2708,7 @@ Delhi India
Dhaka Bangladesh Dhaka Bangladesh
Harbin China Harbin China
Ho Chi Minh City Vietnam Ho Chi Minh City Vietnam
Istanbul Turkey Istanbul Türkiye
Jakarta Indonesia Jakarta Indonesia
Jokohama [Yokohama] Japan Jokohama [Yokohama] Japan
Kanton [Guangzhou] China Kanton [Guangzhou] China
...@@ -2751,7 +2751,7 @@ SELECT City.Name, Country.Name FROM City,Country ...@@ -2751,7 +2751,7 @@ SELECT City.Name, Country.Name FROM City,Country
WHERE City.Country=Country.Code AND City.Population > 3000000; WHERE City.Country=Country.Code AND City.Population > 3000000;
Name Name Name Name
Alexandria Egypt Alexandria Egypt
Ankara Turkey Ankara Türkiye
Baghdad Iraq Baghdad Iraq
Bangkok Thailand Bangkok Thailand
Berlin Germany Berlin Germany
...@@ -2765,7 +2765,7 @@ Delhi India ...@@ -2765,7 +2765,7 @@ Delhi India
Dhaka Bangladesh Dhaka Bangladesh
Harbin China Harbin China
Ho Chi Minh City Vietnam Ho Chi Minh City Vietnam
Istanbul Turkey Istanbul Türkiye
Jakarta Indonesia Jakarta Indonesia
Jokohama [Yokohama] Japan Jokohama [Yokohama] Japan
Kanton [Guangzhou] China Kanton [Guangzhou] China
......
mysql-test/main/statistics.result
View file @ 483ddb56
...@@ -1368,7 +1368,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1368,7 +1368,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -1439,7 +1439,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1439,7 +1439,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -1451,7 +1451,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1451,7 +1451,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -1530,7 +1530,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1530,7 +1530,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
......
mysql-test/main/statistics_json.result
View file @ 483ddb56
...@@ -1728,7 +1728,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1728,7 +1728,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -1799,7 +1799,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1799,7 +1799,7 @@ WORLD CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -1811,7 +1811,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -1811,7 +1811,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
...@@ -3529,7 +3529,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 ...@@ -3529,7 +3529,7 @@ WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467 WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467
WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000 WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000 WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1172 1.0000
WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575 WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232 WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
......
mysql-test/suite/plugins/r/locales.result
View file @ 483ddb56
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 ...@@ -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 ...@@ -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
......
mysql-test/suite/plugins/t/locales.test
View file @ 483ddb56
...@@ -2,6 +2,7 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'lo ...@@ -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;
......
sql/sql_locale.cc
View file @ 483ddb56
...@@ -1919,7 +1919,7 @@ MY_LOCALE my_locale_th_TH ...@@ -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 ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7