diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-07-03 10:41:16 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-07-03 10:41:16 +0400 |
| commit | f832b47833bd03fbb9e972508097f3f88c0ba184 (patch) | |
| tree | 23d3989230570528574ca97d76899c12bf15d7c5 /sql/item_func.h | |
| parent | ccdd63388a789f407d502848d12c618593a5ded1 (diff) | |
| download | mariadb-git-f832b47833bd03fbb9e972508097f3f88c0ba184.tar.gz | |
Removing the "thd" argument from Item::create_field_for_create_select().
"thd" is available through the "table" argument, as table->in_use.
Backporting (partially) from 10.2.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 6a1494040c9..a6d0374d491 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -175,7 +175,7 @@ public: friend class udf_handler; Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg); - Field *create_field_for_create_select(THD *thd, TABLE *table) + Field *create_field_for_create_select(TABLE *table) { return result_type() != STRING_RESULT ? tmp_table_field(table) : @@ -1762,7 +1762,7 @@ public: bool update(); bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); - Field *create_field_for_create_select(THD *thd, TABLE *table) + Field *create_field_for_create_select(TABLE *table) { return result_type() != STRING_RESULT ? tmp_table_field(table) : |