diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 13:34:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 13:34:45 +0200 |
| commit | 2e431ff7e69d9c887777cc597ccf5cfb446e13d8 (patch) | |
| tree | 98be0df7531bbe1f26e1f339cf18430556bca933 /mysql-test/main/join_cache.result | |
| parent | 80b4fa54e1d38c8f90f6b94240c583aa9d4627b7 (diff) | |
| parent | 1fd00998390a7487e42f5e29472e99354159c8bc (diff) | |
| download | mariadb-git-2e431ff7e69d9c887777cc597ccf5cfb446e13d8.tar.gz | |
Merge 10.11 into 11.0
Diffstat (limited to 'mysql-test/main/join_cache.result')
| -rw-r--r-- | mysql-test/main/join_cache.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result index 0965ac8a555..eddae76a724 100644 --- a/mysql-test/main/join_cache.result +++ b/mysql-test/main/join_cache.result @@ -1046,7 +1046,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -1254,7 +1254,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -1517,7 +1517,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -1714,7 +1714,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -1911,7 +1911,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -2108,7 +2108,7 @@ Taiwan NULL Tanzania NULL Thailand NULL Czech Republic NULL -Turkey NULL +Türkiye NULL Uganda NULL Ukraine NULL Hungary NULL @@ -2752,7 +2752,7 @@ SELECT City.Name, Country.Name FROM City,Country WHERE City.Country=Country.Code AND City.Population > 3000000; Name Name Alexandria Egypt -Ankara Turkey +Ankara Türkiye Baghdad Iraq Bangkok Thailand Berlin Germany @@ -2766,7 +2766,7 @@ Delhi India Dhaka Bangladesh Harbin China Ho Chi Minh City Vietnam -Istanbul Turkey +Istanbul Türkiye Jakarta Indonesia Jokohama [Yokohama] Japan Kanton [Guangzhou] China @@ -2809,7 +2809,7 @@ SELECT City.Name, Country.Name FROM City,Country WHERE City.Country=Country.Code AND City.Population > 3000000; Name Name Alexandria Egypt -Ankara Turkey +Ankara Türkiye Baghdad Iraq Bangkok Thailand Berlin Germany @@ -2823,7 +2823,7 @@ Delhi India Dhaka Bangladesh Harbin China Ho Chi Minh City Vietnam -Istanbul Turkey +Istanbul Türkiye Jakarta Indonesia Jokohama [Yokohama] Japan Kanton [Guangzhou] China |