diff options
author | tnurnberg@sin.intern.azundris.com <> | 2007-10-12 11:54:44 +0200 |
---|---|---|
committer | tnurnberg@sin.intern.azundris.com <> | 2007-10-12 11:54:44 +0200 |
commit | 7754e54bd072a544daf08aa12f59d6665e6c4fa2 (patch) | |
tree | 011d767a1438effd79c855a08b6abf5780c18eb1 /mysql-test | |
parent | fa942cf8d0469a472f426a2bbda168b296855496 (diff) | |
parent | 57dc3812686a6af49b7652d0d75bc59a2c30350a (diff) | |
download | mariadb-git-7754e54bd072a544daf08aa12f59d6665e6c4fa2.tar.gz |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/func_sapdb.result | 3 | ||||
-rw-r--r-- | mysql-test/t/func_sapdb.test | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index dbae7e551e5..ba66ac3bc94 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -93,6 +93,9 @@ makedate(9999,365) select makedate(9999,366); makedate(9999,366) NULL +select makedate(100,1); +makedate(100,1) +0100-01-01 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 diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/t/func_sapdb.test index bb65cbaa774..5db6db70e8f 100644 --- a/mysql-test/t/func_sapdb.test +++ b/mysql-test/t/func_sapdb.test @@ -47,6 +47,7 @@ select makedate(1997,1); select makedate(1997,0); select makedate(9999,365); select makedate(9999,366); +select makedate(100,1); #Time functions |