diff options
| author | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
| commit | 0a1076a25f897e4c383cdc5be6b713e65077496b (patch) | |
| tree | e8856cd37d5a43bd18c06a8834fbfff83c0f4998 /mysql-test/r/func_sapdb.result | |
| parent | 97b28521e6f2735ee6488682b15071f604f66cfd (diff) | |
| parent | f34bc883ab4beda7ffd295a89ba62a30f8ccc0e5 (diff) | |
| download | mariadb-git-0a1076a25f897e4c383cdc5be6b713e65077496b.tar.gz | |
Merge with 4.1
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index f80b0281dd8..6556d2be6ad 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -107,13 +107,16 @@ timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002") 46:58:57.999999 select timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002"); timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002") --23:59:59.999999 +-24:00:00.000001 select timediff("1997-12-31 23:59:59.000001","23:59:59.000001"); timediff("1997-12-31 23:59:59.000001","23:59:59.000001") NULL select timediff("2000:01:01 00:00:00", "2000:01:01 00:00:00.000001"); timediff("2000:01:01 00:00:00", "2000:01:01 00:00:00.000001") -00:00:00.000001 +select timediff("2005-01-11 15:48:49.999999", "2005-01-11 15:48:50"); +timediff("2005-01-11 15:48:49.999999", "2005-01-11 15:48:50") +-00:00:00.000001 select maketime(10,11,12); maketime(10,11,12) 10:11:12 @@ -185,7 +188,7 @@ f8 date YES NULL f9 time YES NULL select * from t1; f1 f2 f3 f4 f5 f6 f7 f8 f9 -1997-01-01 1998-01-02 01:01:00 49:01:01 46:58:57 -23:59:59 10:11:12 2001-12-01 01:01:01 1997-12-31 23:59:59 +1997-01-01 1998-01-02 01:01:00 49:01:01 46:58:57 -24:00:00 10:11:12 2001-12-01 01:01:01 1997-12-31 23:59:59 create table test(t1 datetime, t2 time, t3 time, t4 datetime); insert into test values ('2001-01-01 01:01:01', '01:01:01', null, '2001-02-01 01:01:01'), |