diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-21 13:47:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-21 13:47:03 +0300 |
| commit | f1f4bc465fd39632d4a1b5245c19bc4da90ec2b7 (patch) | |
| tree | 45861fe85fa38d1d49bcf25e9f4a866b38ad93f7 /mysql-test/r | |
| parent | 8d982e7690275491fe71bafc917486d7f61ea12c (diff) | |
| parent | 023cbef04c5bec28e939d5076c5f329ab7f3994f (diff) | |
| download | mariadb-git-f1f4bc465fd39632d4a1b5245c19bc4da90ec2b7.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_time.result | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index fd7c6897574..86d2c3932ba 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -27,19 +27,35 @@ DAYOFYEAR("1997-03-03") WEEK("1998-03-03") QUARTER(980303) HOUR("1997-03-03 23:03:22") MINUTE("23:03:22") SECOND(230322) 23 3 22 week(19980101) week(19970101) week(19980101,1) week(19970101,1) -0 1 1 1 +0 0 1 1 week(19981231) week(19971231) week(19981231,1) week(19971231,1) -52 53 53 53 +52 52 53 53 week(19950101) week(19950101,1) 1 0 yearweek('1981-12-31',1) yearweek('1982-01-01',1) yearweek('1982-12-31',1) yearweek('1983-01-01',1) 198153 198153 198252 198252 +yearweek('1987-01-01',1) yearweek('1987-01-01') +198701 198652 +2000 2001 2002 2003 2004 2005 2006 +0 0 0 0 0 0 1 +2000 2001 2002 2003 2004 2005 2006 +1 0 1 1 1 1 1 +2000 2001 2002 2003 2004 2005 2006 +0 1 1 1 1 0 0 +2000 2001 2002 2003 2004 2005 2006 +1 1 1 2 2 1 1 +2000 2001 2002 2003 2004 2005 2006 +199952 200053 200152 200252 200352 200452 200601 +2000 2001 2002 2003 2004 2005 2006 +200001 200053 200201 200301 200401 200501 200601 +2000 2001 2002 2003 2004 2005 2006 +199952 200101 200201 200301 200401 200453 200552 +2000 2001 2002 2003 2004 2005 2006 +200001 200101 200201 200302 200402 200501 200601 date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v') 1998-53 1998-53 date_format('1999-12-31','%x-%v') date_format('2000-01-01','%x-%v') 1999-52 1999-52 -yearweek('1987-01-01',1) yearweek('1987-01-01') -198701 198653 dayname("1962-03-03") dayname("1962-03-03")+0 Saturday 5 monthname("1972-03-04") monthname("1972-03-04")+0 |