diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
| commit | 3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05 (patch) | |
| tree | e8bc6f5b4600582e87466c22bb7da52fe5cb72dc /sql/item_timefunc.h | |
| parent | f832b47833bd03fbb9e972508097f3f88c0ba184 (diff) | |
| download | mariadb-git-3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05.tar.gz | |
Partial backporting of 7b50447aa6d051b8d14bb01ef14802cb8ffee223
(MDEV-9407, MDEV-9408) from 10.1
Needed to fix MDEV-10317 easier.
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index bb840987089..2c1a0943699 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -500,7 +500,7 @@ public: bool get_date(MYSQL_TIME *res, ulonglong fuzzy_date) { DBUG_ASSERT(0); return 1; } my_decimal *val_decimal(my_decimal *decimal_value) { return val_decimal_from_date(decimal_value); } - Field *tmp_table_field(TABLE *table) + Field *create_field_for_create_select(TABLE *table) { return tmp_table_field_from_field_type(table, false, false); } int save_in_field(Field *field, bool no_conversions) { return save_date_in_field(field); } |