diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-02 15:09:20 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-02 15:09:20 +0400 |
| commit | 6665b4040ed5b45ebc73f248ffbf10abfee27ba8 (patch) | |
| tree | dbf271dc1c2d6a7c704830eba3f2186a0d28bacb /mysql-test/r/func_time.result | |
| parent | fe0d48157868935ccaa4e067801bbe50d9b38bb2 (diff) | |
| parent | f94e742d711c33c100bd915d2550c2d73d470998 (diff) | |
| download | mariadb-git-6665b4040ed5b45ebc73f248ffbf10abfee27ba8.tar.gz | |
Merge mysql.com:/home/ram/work/b23616/b23616.4.1
into mysql.com:/home/ram/work/b23616/b23616.5.0
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 45c05f0b5b5..0ad76e892f9 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1050,6 +1050,10 @@ H select last_day('0000-00-00'); last_day('0000-00-00') NULL +select isnull(week(now() + 0)), isnull(week(now() + 0.2)), +week(20061108), week(20061108.01), week(20061108085411.000002); +isnull(week(now() + 0)) isnull(week(now() + 0.2)) week(20061108) week(20061108.01) week(20061108085411.000002) +0 0 45 45 45 End of 4.1 tests explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1, timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2; |