From 381ad2ec6a2bb8c951b88274598e304f695ed04c Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 27 Oct 2009 08:38:32 +0400 Subject: [PATCH] A postfix for WL#1349 Fixing locale name: en_US.UTF-8 -> en_US.utf8 --- mysql-test/r/mysql_locale_posix.result | 2 +- mysql-test/t/mysql_locale_posix.test | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mysql-test/r/mysql_locale_posix.result b/mysql-test/r/mysql_locale_posix.result index f5e38a53474..72a473bb89e 100644 --- a/mysql-test/r/mysql_locale_posix.result +++ b/mysql-test/r/mysql_locale_posix.result @@ -31,7 +31,7 @@ Database: ó +--------+ +--------+ -UTF-8 +utf8 @@character_set_client utf8 Database: ó diff --git a/mysql-test/t/mysql_locale_posix.test b/mysql-test/t/mysql_locale_posix.test index 9c6aafcbd4e..7d306dfc6c4 100644 --- a/mysql-test/t/mysql_locale_posix.test +++ b/mysql-test/t/mysql_locale_posix.test @@ -182,17 +182,17 @@ DROP DATABASE IF EXISTS `ó`; # {"utf-8", "utf8", my_cs_exact}, --echo ---echo UTF-8 ---exec LC_ALL=en_US.UTF-8 $MYSQL --default-character-set=auto test -e "SELECT @@character_set_client" ---exec LC_ALL=en_US.UTF-8 $MYSQLADMIN -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-character-set=auto create ó ---exec LC_ALL=en_US.UTF-8 $MYSQL_SHOW --default-character-set=auto ó ---exec LC_ALL=en_US.UTF-8 $MYSQL_SHOW --default-character-set=auto "ó" ---exec LC_ALL=en_US.UTF-8 $MYSQL_SHOW --default-character-set=auto "Ăł" ---exec LC_ALL=en_US.UTF-8 $MYSQL_SHOW --default-character-set=auto "цЁ" ---exec LC_ALL=en_US.UTF-8 $MYSQL_CHECK --default-character-set=auto ó ---exec LC_ALL=en_US.UTF-8 $MYSQL_CHECK --default-character-set=auto "ó" ---exec LC_ALL=en_US.UTF-8 $MYSQL_CHECK --default-character-set=auto "Ăł" ---exec LC_ALL=en_US.UTF-8 $MYSQL_CHECK --default-character-set=auto "цЁ" +--echo utf8 +--exec LC_ALL=en_US.utf8 $MYSQL --default-character-set=auto test -e "SELECT @@character_set_client" +--exec LC_ALL=en_US.utf8 $MYSQLADMIN -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-character-set=auto create ó +--exec LC_ALL=en_US.utf8 $MYSQL_SHOW --default-character-set=auto ó +--exec LC_ALL=en_US.utf8 $MYSQL_SHOW --default-character-set=auto "ó" +--exec LC_ALL=en_US.utf8 $MYSQL_SHOW --default-character-set=auto "Ăł" +--exec LC_ALL=en_US.utf8 $MYSQL_SHOW --default-character-set=auto "цЁ" +--exec LC_ALL=en_US.utf8 $MYSQL_CHECK --default-character-set=auto ó +--exec LC_ALL=en_US.utf8 $MYSQL_CHECK --default-character-set=auto "ó" +--exec LC_ALL=en_US.utf8 $MYSQL_CHECK --default-character-set=auto "Ăł" +--exec LC_ALL=en_US.utf8 $MYSQL_CHECK --default-character-set=auto "цЁ" SHOW DATABASES LIKE 'ó'; SHOW DATABASES LIKE 'Ăł';