diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-07-01 21:45:57 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-07-01 21:45:57 +0400 |
| commit | 675d8a94f5fb3b9e33a79fcfff3dc2db02c0ca61 (patch) | |
| tree | 94fd81a018d5a06c8f423d1ea219a1d33f462bde /sql/item_func.h | |
| parent | ffac85482b0de13d7780b47edd2a5d5947b528dd (diff) | |
| download | mariadb-git-675d8a94f5fb3b9e33a79fcfff3dc2db02c0ca61.tar.gz | |
Removing the "thd" argument from Item::create_field_for_create_select().
"thd" is available through the "table" argument, as table->in_use.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 8316bb72c7d..a909d93dbaa 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -173,9 +173,8 @@ public: } void signal_divide_by_null(); friend class udf_handler; - Field *create_field_for_create_select(THD *thd, TABLE *table) + Field *create_field_for_create_select(TABLE *table) { - DBUG_ASSERT(thd == table->in_use); return result_type() != STRING_RESULT ? create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) : tmp_table_field_from_field_type(table, false, false); @@ -1789,7 +1788,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 ? create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) : @@ -2158,7 +2157,7 @@ public: enum enum_field_types field_type() const; - Field *create_field_for_create_select(THD *thd, TABLE *table) + Field *create_field_for_create_select(TABLE *table) { return result_type() != STRING_RESULT ? sp_result_field : |