diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-16 15:26:33 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-16 15:26:33 +0400 |
| commit | 096631a3d39c52a98f3c941dd30aa7ed07237cb0 (patch) | |
| tree | 153aa0aac99ed1dd374044f2e4f878501cc4a7ed /mysql-test/r/func_time.result | |
| parent | 44f15caec3145adb09020de90aa38e0201e7a63b (diff) | |
| parent | 69d8bfe2319f313ab31f92a450890a870b630fe7 (diff) | |
| download | mariadb-git-096631a3d39c52a98f3c941dd30aa7ed07237cb0.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index e8fd7a4e4c9..1e5c01be288 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1047,6 +1047,9 @@ union (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H); H 5 +select last_day('0000-00-00'); +last_day('0000-00-00') +NULL 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; |