diff options
| author | unknown <dlenev@mysql.com> | 2005-04-18 14:29:31 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-04-18 14:29:31 +0400 |
| commit | 369791c847474071500eeb77b1a8213a17914515 (patch) | |
| tree | dc587f038eb14c5c52b5e5b57ba0cdcef6f5f5e1 /mysql-test/r/func_sapdb.result | |
| parent | d682dc43467da6dedc84499c57a733d750c4da00 (diff) | |
| parent | ffc8a1b115878e5528f0e2c1585aa853f7ee6c92 (diff) | |
| download | mariadb-git-369791c847474071500eeb77b1a8213a17914515.tar.gz | |
Manual merge of patch for bug #8068 "TIMEDIFF with first negative
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/r/func_sapdb.result:
Manual merge.
sql/item_timefunc.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index 6556d2be6ad..729c5f73e0e 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -195,6 +195,7 @@ insert into test values ('2001-01-01 01:01:01', '-01:01:01', '-23:59:59', "1997-12-31 23:59:59.000001"), ('1997-12-31 23:59:59.000001', '-23:59:59', '-01:01:01', '2001-01-01 01:01:01'), ('2001-01-01 01:01:01', '01:01:01', '-1 01:01:01', null), +('2001-01-01 01:01:01', '-01:01:01', '1 01:01:01', '2001-01-01 01:01:01'), ('2001-01-01 01:01:01', null, '-1 01:01:01', null), (null, null, null, null), ('2001-01-01 01:01:01', '01:01:01', '1 01:01:01', '2001-01-01 01:01:01'); @@ -204,6 +205,7 @@ ttt qqq 2001-01-01 00:00:00 -25:01:00 1997-12-31 00:00:00 -25:01:00 2001-01-01 02:02:02 -24:00:00 +2001-01-01 00:00:00 24:00:00 NULL NULL NULL NULL 2001-01-01 02:02:02 26:02:02 |