summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorunknown <wax@mysql.com>2003-02-19 17:05:35 +0500
committerunknown <wax@mysql.com>2003-02-19 17:05:35 +0500
commitbcd22f2a283cbfdbce3a4f04da6fa8511c373368 (patch)
treeb43c8af65144117d23ebbc91f56df3af6e9ead7b /mysql-test/r/func_time.result
parentc312cd45786f22f0fed89d4cb2d6bba7c6c87644 (diff)
downloadmariadb-git-bcd22f2a283cbfdbce3a4f04da6fa8511c373368.tar.gz
add option default-week-format and variable default_week_format
(SCRUM) mysql-test/r/func_time.result: result of test default_week_format mysql-test/t/func_time.test: test of default_week_format sql/mysqld.cc: add option default-week-format sql/set_var.cc: add system variable default_week_format sql/sql_class.h: add default_week_format into structure system_variables sql/sql_yacc.yy: change lex of week() with one parameter
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index d8491035f0b..38fe97a79a6 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -96,6 +96,11 @@ week(19981231,2) week(19981231,3) week(20000101,2) week(20000101,3)
select week(20001231,2),week(20001231,3);
week(20001231,2) week(20001231,3)
1 52
+set default_week_format = 2;
+select week(20001231),week(20001231,2),week(20001231,0);
+week(20001231) week(20001231,2) week(20001231,0)
+1 1 53
+set default_week_format = 0;
select date_format('1998-12-31','%x-%v'),date_format('1999-01-01','%x-%v');
date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v')
1998-53 1998-53