diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-08 16:49:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-08 16:49:42 +0400 |
| commit | 1f3ec9800c6c186949302ba27f0137dfe7c0f5f5 (patch) | |
| tree | e0e46189e0c73712d39954f0280c63830fd5332e /mysql-test/r/parser.result | |
| parent | 874bb251372d60243d44e2ba74f0237bc88ec8c2 (diff) | |
| parent | 78cc6db44a9f1344dd5c00cf4f3cdde158fe108e (diff) | |
| download | mariadb-git-1f3ec9800c6c186949302ba27f0137dfe7c0f5f5.tar.gz | |
Merging from 5.3
modified:
include/my_time.h
libmysql/libmysql.c
mysql-test/r/adddate_454.result
mysql-test/r/cast.result
mysql-test/r/date_formats.result
mysql-test/r/func_sapdb.result
mysql-test/r/func_time.result
mysql-test/r/mdev316.result
mysql-test/r/parser.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_pruning.result
mysql-test/r/type_date.result
mysql-test/r/type_datetime.result
mysql-test/suite/vcol/r/vcol_misc.result
mysql-test/t/cast.test
sql-common/my_time.c
sql/field.cc
sql/field_conv.cc
sql/filesort.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/sql_time.cc
pending merges:
Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
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 10700d0ba73..a4dfab4bf81 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 |