diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-03 09:46:20 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-03 09:46:20 +0200 |
commit | 78cc6db44a9f1344dd5c00cf4f3cdde158fe108e (patch) | |
tree | 3f6ad0e92adf22f242be974da029d4194dec2cf2 /mysql-test/r/parser.result | |
parent | cfae3065d7ed5b7c5aa35596933d9f234f221878 (diff) | |
download | mariadb-git-78cc6db44a9f1344dd5c00cf4f3cdde158fe108e.tar.gz |
MDEV-4667 DATE('string') incompability between mysql and mariadb
Cleanup: remove TIME_FUZZY_DATE.
Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting
value is only used for comparison. It can be invalid date, fine, as long as it can be
compared".
Updated many tests results (they're better now).
Diffstat (limited to 'mysql-test/r/parser.result')
-rw-r--r-- | mysql-test/r/parser.result | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result index 1f5b359199d..6af68b8c938 100644 --- a/mysql-test/r/parser.result +++ b/mysql-test/r/parser.result @@ -555,14 +555,10 @@ ERROR 42000: Incorrect parameters in the call to native function 'atan' DROP TABLE IF EXISTS t1; 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 -Warnings: -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date +22:10:00 SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE; STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE -NULL -Warnings: -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date +22:01:00 SELECT "1997-12-31 23:59:59" + INTERVAL 1 SECOND; "1997-12-31 23:59:59" + INTERVAL 1 SECOND 1998-01-01 00:00:00 |