summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2005-03-28 16:20:55 +0400
committerdlenev@brandersnatch.localdomain <>2005-03-28 16:20:55 +0400
commitaae37f5ea55ddae987fe4f34a74f5019b503f4f5 (patch)
tree30e066b880d981698995d8ed3f176241106f0e74 /mysql-test/t
parentff8017f0d3ed518ec9045be6e983bd446cb6480c (diff)
downloadmariadb-git-aae37f5ea55ddae987fe4f34a74f5019b503f4f5.tar.gz
Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong
result" (and similar bug in ADDTIME/SUBTIME). Both Item_func_add_time/Item_func_timediff::val_str() now use calc_time_diff() function which was backported from 5.0 (and which was was fixed to properly handle microseconds part of its second argument). Also now we correctly set sign of result in case when first argument is negative and second is positive.
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/func_sapdb.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/t/func_sapdb.test
index de433485fca..da3affaa36d 100644
--- a/mysql-test/t/func_sapdb.test
+++ b/mysql-test/t/func_sapdb.test
@@ -100,6 +100,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');