diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-12 12:42:42 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-12 12:42:42 +0200 |
| commit | e1c1abd0e189e4581b9a22aed923df37e535e89b (patch) | |
| tree | 64ca040d65207f67531780b5d412e720c122c372 /mysql-test/r/func_time.result | |
| parent | 3165440cdec9d1270a2101973cb75e67e334dc5c (diff) | |
| download | mariadb-git-e1c1abd0e189e4581b9a22aed923df37e535e89b.tar.gz | |
Extended WEEK() to be able to handle ISO weeks.
unlink socket file if mysqld dies on startup
Some optimization of AND expressions
mysql-test/r/func_time.result:
Update for new week() handling
mysql-test/t/func_time.test:
Update for new week() handling
sql/item_cmpfunc.cc:
Optimization of IF( and-expression,,)
sql/item_cmpfunc.h:
Optimization of AND expressions
sql/item_timefunc.cc:
Extended WEEK() to be able to handle ISO weeks.
sql/mysqld.cc:
unlink socket file if mysqld dies on startup
sql/sql_base.cc:
Fixed problem with SIGHUP and INSERT DELAYED
tests/Makefile.am:
Added missing myisam-big-rows.tst file to source distribution
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index e4fd25a34f0..4a1012f73bf 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -84,6 +84,12 @@ select yearweek("2000-01-01",1) as '2000', yearweek("2001-01-01",1) as '2001', y select yearweek("2000-01-06",1) as '2000', yearweek("2001-01-06",1) as '2001', yearweek("2002-01-06",1) as '2002',yearweek("2003-01-06",1) as '2003', yearweek("2004-01-06",1) as '2004', yearweek("2005-01-06",1) as '2005', yearweek("2006-01-06",1) as '2006'; 2000 2001 2002 2003 2004 2005 2006 200001 200101 200201 200302 200402 200501 200601 +select week(19981231,2), week(19981231,3), week(20000101,2), week(20000101,3); +week(19981231,2) week(19981231,3) week(20000101,2) week(20000101,3) +52 53 52 52 +select week(20001231,2),week(20001231,3); +week(20001231,2) week(20001231,3) +1 52 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 |