diff options
| author | unknown <evgen@moonbone.local> | 2006-06-30 02:03:09 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-30 02:03:09 +0400 |
| commit | 3cf92fb7d67b22f33f4846ecf68c3f56c301cc20 (patch) | |
| tree | 6ce5b21a6641825299a323d1ead34db5a94565ba /mysql-test/r/func_sapdb.result | |
| parent | 6ea7aafc0a8138d0092fbc7e5a4c5ea993157162 (diff) | |
| parent | 52a1639b0eb669363cfa311b5ce24aa83076a426 (diff) | |
| download | mariadb-git-3cf92fb7d67b22f33f4846ecf68c3f56c301cc20.tar.gz | |
Merge
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/func_time.result:
SCCS merged
mysql-test/t/func_time.test:
SCCS merged
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index d984eee80fa..64eb6eefd1a 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -81,6 +81,12 @@ makedate(1997,1) select makedate(1997,0); makedate(1997,0) NULL +select makedate(9999,365); +makedate(9999,365) +9999-12-31 +select makedate(9999,366); +makedate(9999,366) +NULL select addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002"); addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002") 1998-01-02 01:01:01.000001 |