diff options
author | Alexander Barkov <bar@mariadb.com> | 2018-11-14 16:00:38 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2018-11-14 16:00:38 +0400 |
commit | b9a9055793ab8b9a50200e2f55602463627dedd3 (patch) | |
tree | bb245b2e03aa973439f7c50f69019b8622bf22af /libmysqld | |
parent | 62bcd74712680fa07c9ed8c42c384c8825c4f9af (diff) | |
download | mariadb-git-b9a9055793ab8b9a50200e2f55602463627dedd3.tar.gz |
MDEV-17712 Remove C_TIME_FUZZY_DATES, C_TIME_DATETIME_ONLY, C_TIME_TIME_ONLY
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/libmysql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index b3ef96698ff..98dc9f17f60 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -3215,7 +3215,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; MYSQL_TIME_STATUS status; - str_to_time(value, length, tm, 0, &status); + str_to_datetime_or_date_or_time(value, length, tm, 0, &status); err= status.warnings; *param->error= MY_TEST(err); break; @@ -3226,7 +3226,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; MYSQL_TIME_STATUS status; - (void) str_to_datetime(value, length, tm, 0, &status); + (void) str_to_datetime_or_date(value, length, tm, 0, &status); err= status.warnings; *param->error= MY_TEST(err) && (param->buffer_type == MYSQL_TYPE_DATE && tm->time_type != MYSQL_TIMESTAMP_DATE); @@ -3350,7 +3350,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_DATETIME: { int error; - value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error); + value= number_to_datetime_or_date(value, 0, (MYSQL_TIME *) buffer, 0, &error); *param->error= MY_TEST(error); break; } |