diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2005-01-15 20:02:46 +0300 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2005-01-15 20:02:46 +0300 |
| commit | 26e0d1e47973cda6b663ac7214cf85c2bb36d929 (patch) | |
| tree | 495065916f2afa9d80b2bed614e60acfc6fdad75 /mysql-test/r/func_sapdb.result | |
| parent | 9d983231b9e90596736f8acadc8816cbf7c50b6d (diff) | |
| download | mariadb-git-26e0d1e47973cda6b663ac7214cf85c2bb36d929.tar.gz | |
Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly"
to 5.0 tree (since it was lost during last merge).
mysql-test/r/func_sapdb.result:
Updated test result after fixing bug #7586 "TIMEDIFF for sec+microsec not
working properly" in 5.0 tree.
sql/item_timefunc.cc:
calc_time_diff():
Use simplier and less error-prone implementation. Now we are counting
difference between time values in microseconds and then convert it to
seconds + microseconds value (instead of using seconds and taking
difference in "second_part"s into account).
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index a2918e71d68..6556d2be6ad 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -107,7 +107,7 @@ 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 @@ -116,7 +116,7 @@ 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:01.999999 +-00:00:00.000001 select maketime(10,11,12); maketime(10,11,12) 10:11:12 @@ -188,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'), |