diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
| commit | 97e640b9ae83e07b444fceede6b0524256c7a3cc (patch) | |
| tree | 8f48fbfaf88ea7895ce59fd3ac2fbe6184334387 /mysql-test/r/parser.result | |
| parent | 2f6a2494a5eb2cf3ab06fbedd2584eca85d90230 (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-97e640b9ae83e07b444fceede6b0524256c7a3cc.tar.gz | |
5.5 merge
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 54378f16d49..e81eea6e887 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: -Warning 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: -Warning 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 |