diff options
author | Alexander Barkov <bar@mariadb.org> | 2013-07-10 12:12:27 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2013-07-10 12:12:27 +0400 |
commit | d98584f56a5ec46d6258bba6250c6c797a678afd (patch) | |
tree | 7608b63b2a1e8bf9b6f9e74f9a0dd6a5848fbdbb /client/mysqlbinlog.cc | |
parent | 17f3ae267f3b8c189be1671f86902f24ae79cdeb (diff) | |
download | mariadb-git-d98584f56a5ec46d6258bba6250c6c797a678afd.tar.gz |
Adding support for the SQL-standard 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
Diffstat (limited to 'client/mysqlbinlog.cc')
-rw-r--r-- | client/mysqlbinlog.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index c099459f61e..f38a88749db 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1541,13 +1541,14 @@ the mysql command line client.\n\n"); static my_time_t convert_str_to_timestamp(const char* str) { - int was_cut; + MYSQL_TIME_STATUS status; MYSQL_TIME l_time; long dummy_my_timezone; uint dummy_in_dst_time_gap; + /* We require a total specification (date AND time) */ - if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &was_cut) != - MYSQL_TIMESTAMP_DATETIME || was_cut) + if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &status) || + l_time.time_type != MYSQL_TIMESTAMP_DATETIME || status.warnings) { error("Incorrect date and time argument: %s", str); exit(1); |