summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2006-07-04 17:40:40 +0500
committerunknown <bar@mysql.com>2006-07-04 17:40:40 +0500
commit184ff212b6994a0f9eba62727999fd3036c39c83 (patch)
treeda4ef218310ffe8d64ab2d02aa886916c6d53432 /mysql-test
parent4ffd445b569b9cb8af0f39d267f1d8f09ebd47a2 (diff)
downloadmariadb-git-184ff212b6994a0f9eba62727999fd3036c39c83.tar.gz
WL#2928 Date Translation NRE
(implemented by by Josh Chamas) libmysqld/Makefile.am: Adding new source file mysql-test/r/date_formats.result: Adding test case mysql-test/t/date_formats.test: Adding test case sql/Makefile.am: Adding new source file BitKeeper/etc/ignore: Added libmysqld/sql_locale.cc to the ignore list sql/item_timefunc.cc: Using current locale data, instead of hard coded English names. sql/mysql_priv.h: Adding new type MY_LOCALE, and declaring new global variables. sql/set_var.cc: Adding "lc_time_names" system variable. sql/set_var.h: Adding "lc_time_names" system variable. sql/sql_cache.cc: Adding lc_time_names as a query cache flag. sql/sql_class.cc: Setting default locale to en_US sql/sql_class.h: Adding locale variable into system_variables. sql/sql_locale.cc: Adding new file with locale data for various languages
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/date_formats.result16
-rw-r--r--mysql-test/t/date_formats.test14
2 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index 24abdfcf148..00335d2b1b0 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -456,6 +456,22 @@ f1 f2
Warnings:
Warning 1292 Truncated incorrect date value: '2003-04-05 g'
Warning 1292 Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'
+set names latin1;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+date_format('2004-01-01','%W (%a), %e %M (%b) %Y')
+Thursday (Thu), 1 January (Jan) 2004
+set lc_time_names=ru_RU;
+set names koi8r;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+date_format('2004-01-01','%W (%a), %e %M (%b) %Y')
+þÅÔ×ÅÒÇ (þÔ×), 1 ñÎ×ÁÒÑ (ñÎ×) 2004
+set lc_time_names=de_DE;
+set names latin1;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+date_format('2004-01-01','%W (%a), %e %M (%b) %Y')
+Donnerstag (Do), 1 Januar (Jan) 2004
+set names latin1;
+set lc_time_names=en_US;
create table t1 (f1 datetime);
insert into t1 (f1) values ("2005-01-01");
insert into t1 (f1) values ("2005-02-01");
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test
index f3d507e69e6..362f4614464 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -261,6 +261,20 @@ select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1,
--enable_ps_protocol
#
+# Test of locale dependent date format (WL#2928 Date Translation NRE)
+#
+set names latin1;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+set lc_time_names=ru_RU;
+set names koi8r;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+set lc_time_names=de_DE;
+set names latin1;
+select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');
+set names latin1;
+set lc_time_names=en_US;
+
+#
# Bug #14016
#
create table t1 (f1 datetime);