diff options
| author | unknown <wax@mysql.com> | 2003-02-24 23:54:58 +0500 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2003-02-24 23:54:58 +0500 |
| commit | 2842e601e0334a01f3a8dc3acc4cac1ef130d370 (patch) | |
| tree | 944c3c399a85b6776f8b32e53d26960768db432d /mysql-test | |
| parent | 6f5ea7022660f62e8e434c968f0d256aa8c8e47c (diff) | |
| parent | bcd22f2a283cbfdbce3a4f04da6fa8511c373368 (diff) | |
| download | mariadb-git-2842e601e0334a01f3a8dc3acc4cac1ef130d370.tar.gz | |
Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql-4n
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_time.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 4 |
2 files changed, 9 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 diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 903b80eb12a..af222b0b3cc 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -41,6 +41,10 @@ select yearweek("2000-01-06",1) as '2000', yearweek("2001-01-06",1) as '2001', y select week(19981231,2), week(19981231,3), week(20000101,2), week(20000101,3); select week(20001231,2),week(20001231,3); +set default_week_format = 2; +select week(20001231),week(20001231,2),week(20001231,0); +set default_week_format = 0; + select date_format('1998-12-31','%x-%v'),date_format('1999-01-01','%x-%v'); select date_format('1999-12-31','%x-%v'),date_format('2000-01-01','%x-%v'); |