bzr commit into mysql-next-mr branch (bar:3124) WL#5303

[Alexander Barkov]

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

 3124 Alexander Barkov	2010-05-06
      A post-fix for WL#5303 Romansh locale for DAYNAME, MONTHNAME, DATE_FORMAT

    modified:
      mysql-test/suite/sys_vars/r/lc_time_names_basic.result
      mysql-test/suite/sys_vars/t/lc_time_names_basic.test
=== modified file 'mysql-test/suite/sys_vars/r/lc_time_names_basic.result'
--- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result	2010-02-18 17:10:39 +0000
+++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result	2010-05-06 07:24:49 +0000
@@ -1022,7 +1022,11 @@ SELECT @@lc_time_names;
 @@lc_time_names
 el_GR
 SET @@lc_time_names = 110;
-ERROR HY000: Unknown locale: '110'
+SELECT @@lc_time_names;
+@@lc_time_names
+rm_CH
+SET @@lc_time_names = 111;
+ERROR HY000: Unknown locale: '111'
 '#--------------------FN_DYNVARS_060_10-------------------------#'
 SET @@lc_time_names = en_EN;
 ERROR HY000: Unknown locale: 'en_EN'

=== modified file 'mysql-test/suite/sys_vars/t/lc_time_names_basic.test'
--- a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test	2010-05-06 07:24:49 +0000
@@ -622,8 +622,10 @@ SET @@lc_time_names = 108;
 SELECT @@lc_time_names;
 SET @@lc_time_names = 109;
 SELECT @@lc_time_names;
---Error ER_UNKNOWN_LOCALE
 SET @@lc_time_names = 110;
+SELECT @@lc_time_names;
+--Error ER_UNKNOWN_LOCALE
+SET @@lc_time_names = 111;
 
 --echo '#--------------------FN_DYNVARS_060_10-------------------------#'
 #############################################################################


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