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 | 599fde0c5160e46eb856cd228e75cd3d611981b9 (patch) | |
| tree | dc587f038eb14c5c52b5e5b57ba0cdcef6f5f5e1 /mysql-test/t/func_sapdb.test | |
| parent | ede0adac425fbe30e7d47690568858e73e93fed6 (diff) | |
| parent | 4594ea1fd10841253a8d0a9d8a7ac99c248eeb71 (diff) | |
| download | mariadb-git-599fde0c5160e46eb856cd228e75cd3d611981b9.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/t/func_sapdb.test')
| -rw-r--r-- | mysql-test/t/func_sapdb.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/t/func_sapdb.test index cb3ab12b5fc..bb9159eefbe 100644 --- a/mysql-test/t/func_sapdb.test +++ b/mysql-test/t/func_sapdb.test @@ -106,6 +106,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'); |