database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge of patch for bug #8068 "TIMEDIFF with first negative

Browse Source 
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.
This commit is contained in:
unknown
2005-04-18 14:29:31 +04:00
parent ede0adac42 4594ea1fd1
commit 599fde0c51
3 changed files with 97 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_sapdb.result
View File

@ -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