bzr push into mysql-pe branch (bar:3674 to 3675) Bug#43207

[Alexander Barkov]

 3675 Alexander Barkov	2009-10-19 [merge]
      Merging Bug#43207 from mysql-5.1-bugfixing

    removed:
      mysql-test/r/locale.result
      mysql-test/t/locale.test
    added:
      mysql-test/r/locale.result
      mysql-test/t/locale.test
    modified:
      sql/sql_locale.cc
 3674 Ramil Kalimullin	2009-10-19 [merge]
      Automerge

    modified:
      mysql-test/r/innodb_mysql.result
      mysql-test/t/innodb_mysql.test
      sql/item.cc
=== added file 'mysql-test/r/locale.result'
--- a/mysql-test/r/locale.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/locale.result	2009-10-19 09:35:33 +0000
@@ -0,0 +1,77 @@
+DROP TABLE IF EXISTS t1;
+Start of 5.1 tests
+#
+# Bug#43207 wrong LC_TIME names for romanian locale
+#
+SET NAMES utf8;
+SET lc_time_names=ro_RO;
+SELECT DATE_FORMAT('2001-01-01', '%w %a %W');
+DATE_FORMAT('2001-01-01', '%w %a %W')
+1 Lu Luni
+SELECT DATE_FORMAT('2001-01-02', '%w %a %W');
+DATE_FORMAT('2001-01-02', '%w %a %W')
+2 Ma MarORMAT('2001-01-03', '%w %a %W')
+3 Mi Miercuri
+SELECT DATE_FORMAT('2001-01-04', '%w %a %W');
+DATE_FORMAT('2001-01-04', '%w %a %W')
+4 Jo Joi
+SELECT DATE_FORMAT('2001-01-05', '%w %a %W');
+DATE_FORMAT('2001-01-05', '%w %a %W')
+5 Vi Vineri
+SELECT DATE_FORMAT('2001-01-06', '%w %a %W');
+DATE_FORMAT('2001-01-06', '%w %a %W')
+6 Sâ Sâmbătă
+SELECT DATE_FORMAT('2001-01-07', '%w %a %W');
+DATE_FORMAT('2001-01-07', '%w %a %W')
+0 Du Duminică
+End of 5.1 tests
+Start of 5.4 tests
+#
+# WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
+#
+SET NAMES utf8;
+SET @@lc_time_names=109;
+SELECT @@lc_time_names;
+@@lc_time_names
+el_GR
+CREATE TABLE t1 (a DATE);
+INSERT INTO t1 VALUES
+('2006-01-01'),('2006-01-02'),('2006-01-03'),
+('2006-01-04'),('2006-01-05'),('2006-01-06'),('2006-01-07');
+SELECT a, date_format(a,'%a') as abday, dayname(a) as day FROM t1 ORDER BY a;
+a	abday	day
[phone]	Κυ01-03	Τρί	Τρίτη
[phone]	Τετ	Τετάρτη
[phone]	Πέμ	Πέμπτη
[phone]	Παρ	ΠαLE t1;
+CREATE TABLE t1 (a DATE);
+INSERT INTO t1 VALUES
+('2006-01-01'),('2006-02-01'),('2006-03-01'),
+('2006-04-01'),('2006-05-01'),('2006-06-01'),
+('2006-07-01'),('2006-08-01'),('2006-09-01'),
+('2006-10-01'),('2006-11-01'),('2006-12-01');
+SELECT a, date_format(a,'%b') as abmon, monthname(a) as mon FROM t1 ORDER BY a;
+a	abmon	mon
[phone]	Ιαν	Ιανουάριος
[phone]	Φεβ	2006-04-01	Απρ	Απρίλιος
[phone]	Μάι	Μ	Οκτ	Οκτώβριος
[phone]	Νοέ	Νοέμβormat(123456.789, 3, 'el_GR');
+format(123456.789, 3, 'el_GR')
+123456.789
+DROP TABLE t1;
+End of 5.4 tests

=== removed file 'mysql-test/r/locale.result'
--- a/mysql-test/r/locale.result	2009-10-06 06:02:51 +0000
+++ b/mysql-test/r/locale.result	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-DROP TABLE IF EXISTS t1;
-Start of 5.4 tests
-#
-# WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
-#
-SET NAMES utf8;
-SET @@lc_time_names=109;
-SELECT @@lc_time_names;
-@@lc_time_names
-el_GR
-CREATE TABLE t1 (a DATE);
-INSERT INTO t1 VALUES
-('2006-01-01'),('2006-01-02'),('2006-01-03'),
-('2006-01-04'),('2006-01-05'),('2006-01-06'),('2006-01-07');
-SELECT a, date_format(a,'%a') as abday, dayname(a) as day FROM t1 ORDER BY a;
-a	abday	day
-2006-01-01	Κυρ	Κυριακή
-2006-01-02	Δευ	Δευτέρα
-2006-01-03	Τρί	Τρίτη
-2006-01-04	Τετ	Τετάρτη
-2006-01-05	Πέμ	Πέμπτη
-2006-01-06	Παρ	Παρασκευή
-2006-01-07	Σάβ	Σάββατο
-DROP TABLE t1;
-CREATE TABLE t1 (a DATE);
-INSERT INTO t1 VALUES
-('2006-01-01'),('2006-02-01'),('2006-03-01'),
-('2006-04-01'),('2006-05-01'),('2006-06-01'),
-('2006-07-01'),('2006-08-01'),('2006-09-01'),
-('2006-10-01'),('2006-11-01'),('2006-12-01');
-SELECT a, date_format(a,'%b') as abmon, monthname(a) as mon FROM t1 ORDER BY a;
-a	abmon	mon
-2006-01-01	Ιαν	Ιανουάριο-2006-05-01	Μάι	Μάιος
-2006-06-01	Ιούν	Ιούνιος
-2006-07-01	Ιούλ	Ιούλιος
-2006-08-01	Αύγ	Αύγουστος
-2006-09-01	Σεπ	Σεπτέμβριος
-2006-10-01	Οκτ	Οκτώβριος
-2006-11-01	Νοέ	Νοέμβριος
-2006-12-01	Δεκ	Δεκέμβριος
-SELECT format(123456.789, 3, 'el_GR');
-format(123456.789, 3, 'el_GR')
-123456.789
-DROP TABLE t1;
-End of 5.4 tests

=== added file 'mysql-test/t/locale.test'
--- a/mysql-test/t/locale.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/locale.test	2009-10-19 09:35:33 +0000
@@ -0,0 +1,49 @@
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--echo Start of 5.1 tests
+--echo #
+--echo # Bug#43207 wrong LC_TIME names for romanian locale
+--echo #
+SET NAMES utf8;
+SET lc_time_names=ro_RO;
+SELECT DATE_FORMAT('2001-01-01', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-02', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-03', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-04', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-05', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-06', '%w %a %W');
+SELECT DATE_FORMAT('2001-01-07', '%w %a %W');
+--echo End of 5.1 tests
+
+--echo Start of 5.4 tests
+
+--echo #
+--echo # WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
+--echo #
+
+SET NAMES utf8;
+
+SET @@lc_time_names=109;
+SELECT @@lc_time_names;
+
+CREATE TABLE t1 (a DATE);
+INSERT INTO t1 VALUES
+('2006-01-01'),('2006-01-02'),('2006-01-03'),
+('2006-01-04'),('2006-01-05'),('2006-01-06'),('2006-01-07');
+SELECT a, date_format(a,'%a') as abday, dayname(a) as day FROM t1 ORDER BY a;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DATE);
+INSERT INTO t1 VALUES
+('2006-01-01'),('2006-02-01'),('2006-03-01'),
+('2006-04-01'),('2006-05-01'),('2006-06-01'),
+('2006-07-01'),('2006-08-01'),('2006-09-01'),
+('2006-10-01'),('2006-11-01'),('2006-12-01');
+SELECT a, date_format(a,'%b') as abmon, monthname(a) as mon FROM t1 ORDER BY a;
+
+SELECT format(123456.789, 3, 'el_GR');
+DROP TABLE t1;
+
+--echo End of 5.4 tests

=== removed file 'mysql-test/t/locale.test'
--- a/mysql-test/t/locale.test	2009-10-06 06:02:51 +0000
+++ b/mysql-test/t/locale.test	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
---echo Start of 5.4 tests
-
---echo #
---echo # WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
---echo #
-
-SET NAMES utf8;
-
-SET @@lc_time_names=109;
-SELECT @@lc_time_names;
-
-CREATE TABLE t1 (a DATE);
-INSERT INTO t1 VALUES
-('2006-01-01'),('2006-01-02'),('2006-01-03'),
-('2006-01-04'),('2006-01-05'),('2006-01-06'),('2006-01-07');
-SELECT a, date_format(a,'%a') as abday, dayname(a) as day FROM t1 ORDER BY a;
-DROP TABLE t1;
-
-CREATE TABLE t1 (a DATE);
-INSERT INTO t1 VALUES
-('2006-01-01'),('2006-02-01'),('2006-03-01'),
-('2006-04-01'),('2006-05-01'),('2006-06-01'),
-('2006-07-01'),('2006-08-01'),('2006-09-01'),
-('2006-10-01'),('2006-11-01'),('2006-12-01');
-SELECT a, date_format(a,'%b') as abmon, monthname(a) as mon FROM t1 ORDER BY a;
-
-SELECT format(123456.789, 3, 'el_GR');
-DROP TABLE t1;
-
---echo End of 5.4 tests

=== modified file 'sql/sql_locale.cc'
--- a/sql/sql_locale.cc	2009-10-06 06:43:32 +0000
+++ b/sql/sql_locale.cc	2009-10-19 09:35:33 +0000
@@ -1515,9 +1515,9 @@ static const char *my_locale_month_names
 static const char *my_locale_ab_month_names_ro_RO[13] = 
  {"ian","feb","mar","apr","mai","iun","iul","aug","sep","oct","nov","dec", NullS };
 static const char *my_locale_day_names_ro_RO[8] = 
- {"Luni","Marţi","Miercuri","Joi","Vineri","SîmbĂtĂ","DuminicĂ", NullS };
+ {"Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă","Duminică", NullS };
 static const char *my_locale_ab_day_names_ro_RO[8] = 
- {"Lu","Ma","Mi","Jo","Vi","Sî","Du", NullS };
+ {"Lu","Ma","Mi","Jo","Vi","Sâ","Du", NullS };
 static TYPELIB my_locale_typelib_month_names_ro_RO = 
  { array_elements(my_locale_month_names_ro_RO)-1, "", my_locale_month_names_ro_RO, NULL };
 static TYPELIB my_locale_typelib_ab_month_names_ro_RO = 

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