diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
| commit | ad8e02ac452dc94d64b65cb9855b6dba97b651d4 (patch) | |
| tree | 7c355aab42a911476eaa10520d1adbabb7091243 /sql/event_parse_data.cc | |
| parent | 492998c0d80aa7d5c4804ac7792a38333e3b83dd (diff) | |
| download | mariadb-git-ad8e02ac452dc94d64b65cb9855b6dba97b651d4.tar.gz | |
MDEV-17317 Add THD* parameter into Item::get_date() and stricter data type control to "fuzzydate"
Diffstat (limited to 'sql/event_parse_data.cc')
| -rw-r--r-- | sql/event_parse_data.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index d20d322d864..bfda8438885 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -216,7 +216,7 @@ Event_parse_data::init_execute_at(THD *thd) (starts_null && ends_null))); DBUG_ASSERT(starts_null && ends_null); - if (item_execute_at->get_date(<ime, TIME_NO_ZERO_DATE)) + if (item_execute_at->get_date(thd, <ime, TIME_NO_ZERO_DATE)) goto wrong_value; ltime_utc= TIME_to_timestamp(thd,<ime,¬_used); @@ -275,7 +275,7 @@ Event_parse_data::init_interval(THD *thd) if (item_expression->fix_fields(thd, &item_expression)) goto wrong_value; - if (get_interval_value(item_expression, interval, &interval_tmp)) + if (get_interval_value(thd, item_expression, interval, &interval_tmp)) goto wrong_value; expression= 0; @@ -378,7 +378,7 @@ Event_parse_data::init_starts(THD *thd) if (item_starts->fix_fields(thd, &item_starts)) goto wrong_value; - if (item_starts->get_date(<ime, TIME_NO_ZERO_DATE)) + if (item_starts->get_date(thd, <ime, TIME_NO_ZERO_DATE)) goto wrong_value; ltime_utc= TIME_to_timestamp(thd, <ime, ¬_used); @@ -433,7 +433,7 @@ Event_parse_data::init_ends(THD *thd) goto error_bad_params; DBUG_PRINT("info", ("convert to TIME")); - if (item_ends->get_date(<ime, TIME_NO_ZERO_DATE)) + if (item_ends->get_date(thd, <ime, TIME_NO_ZERO_DATE)) goto error_bad_params; ltime_utc= TIME_to_timestamp(thd, <ime, ¬_used); |