diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-10 18:46:33 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-10 18:46:33 +0400 |
| commit | a057b504904c3e6ab1e3006c081b4fb23faaf1d4 (patch) | |
| tree | 338485c4cb052eba8d60f8c9d1a6077ef4c377b0 /sql/item_strfunc.cc | |
| parent | 5b0774ee1c5a32ef694ce18413fa003bc6646c48 (diff) | |
| parent | d98584f56a5ec46d6258bba6250c6c797a678afd (diff) | |
| download | mariadb-git-a057b504904c3e6ab1e3006c081b4fb23faaf1d4.tar.gz | |
Merging temporal literals
added:
mysql-test/r/temporal_literal.result
mysql-test/t/temporal_literal.test
modified:
client/mysqlbinlog.cc
include/my_time.h
mysql-test/r/cast.result
mysql-test/r/partition_innodb.result
mysql-test/t/cast.test
mysql-test/t/partition_innodb.test
sql-common/my_time.c
sql/field.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_create.h
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/sql_select.cc
sql/sql_time.cc
sql/sql_time.h
sql/sql_yacc.yy
storage/spider/spd_db_mysql.cc
pending merges:
Alexander Barkov 2013-07-10 Adding support for the SQL-standard temporal...
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 132515733d6..1495456bda4 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -4725,7 +4725,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) if (str_to_datetime_with_warn(&my_charset_numeric, val.x.string.value.str, val.x.string.value.length, - ltime, fuzzy_date) <= MYSQL_TIMESTAMP_ERROR) + ltime, fuzzy_date)) goto null; return 0; case DYN_COL_DATETIME: |