summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-06-19 14:02:19 +0500
committerunknown <gluh@gluh.mysql.r18.ru>2003-06-19 14:02:19 +0500
commit85d2282e257ba47555fc05ef62dc70ece5b7a69e (patch)
treee791f002cd3e313d2564441aa8afebf1b8b6ce0d /mysql-test/r/func_time.result
parent725a4c39d2815315a1b2aa40bc2ce6bb54d3b828 (diff)
downloadmariadb-git-85d2282e257ba47555fc05ef62dc70ece5b7a69e.tar.gz
SCRUM
Task ID 894: Backport default_week_format variable to 4.0 mysql-test/r/func_time.result: Backport default_week_format variable to 4.0 mysql-test/t/func_time.test: Backport default_week_format variable to 4.0 sql/mysqld.cc: Backport default_week_format variable to 4.0 sql/set_var.cc: Backport default_week_format variable to 4.0 sql/sql_class.h: Backport default_week_format variable to 4.0 sql/sql_yacc.yy: Backport default_week_format variable to 4.0
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 06c0be86667..58a05a2336f 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