diff options
| author | unknown <kaa@polly.local> | 2007-03-06 20:35:25 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-03-06 20:35:25 +0300 |
| commit | aeb16245abb4de751793d63a77530f517c8dce5e (patch) | |
| tree | a7c89c1410a9cacf67d48878ed01b44e7481aaed /mysql-test/r/func_time.result | |
| parent | d65ae804cdd74daa6b18618dd81bfee92502597b (diff) | |
| parent | cccad802ef31bcf96badaa67f4224fbe3b8d5985 (diff) | |
| download | mariadb-git-aeb16245abb4de751793d63a77530f517c8dce5e.tar.gz | |
Merge polly.local:/tmp/maint/bug20293/my50-bug20293
into polly.local:/tmp/maint/bug20293/my51-bug20293
mysql-test/r/func_time.result:
SCCS merged
mysql-test/t/func_time.test:
SCCS merged
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 1f52076f3d2..8e893702e98 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1183,6 +1183,10 @@ set time_zone= @@global.time_zone; select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE NULL +SELECT TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") FROM (SELECT 3020399 AS a UNION SELECT 3020398 ) x GROUP BY 1; +TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") +838:59:58 +838:59:59 End of 5.0 tests select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND); date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND) |