bzr commit into mysql-5.5.0-next-mr branch (bar:2905) WL#1349

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-next-mr-bar/ based on revid:bar@stripped

 2905 Alexander Barkov	2009-10-27
      A postfix for WL#1349
      Fixing locale name: en_US.UTF-8 -> en_US.utf8

    modified:
      mysql-test/r/mysql_locale_posix.result
      mysql-test/t/mysql_locale_posix.test
=== modified file 'mysql-test/r/mysql_locale_posix.result'
--- a/mysql-test/r/mysql_locale_posix.result	2009-10-26 12:29:41 +0000
+++ b/mysql-test/r/mysql_locale_posix.result	2009-10-27 04:38:32 +0000
@@ -31,7 +31,7 @@ Database: ó
 +--------+
 +--------+
 
-UTF-8
+utf8
 @@character_set_client
 utf8
 Database: ó

=== modified file 'mysql-test/t/mysql_locale_posix.test'
--- a/mysql-test/t/mysql_locale_posix.test	2009-10-26 12:29:41 +0000
+++ b/mysql-test/t/mysql_locale_posix.test	2009-10-27 04:38:32 +0000
@@ -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 'Ăł';

Attachment: [text/bzr-bundle] bzr/[e-mail]