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/sql_insert.cc | |
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/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d237360190e..80287793175 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3934,10 +3934,10 @@ void select_insert::abort_result_set() { CREATE TABLE (SELECT) ... ***************************************************************************/ -Field *Item::create_field_for_create_select(THD *thd, TABLE *table) +Field *Item::create_field_for_create_select(TABLE *table) { Field *def_field, *tmp_field; - return ::create_tmp_field(thd, table, this, type(), + return ::create_tmp_field(table->in_use, table, this, type(), (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0); } @@ -4012,7 +4012,7 @@ static TABLE *create_table_from_items(THD *thd, while ((item=it++)) { - Field *tmp_field= item->create_field_for_create_select(thd, &tmp_table); + Field *tmp_field= item->create_field_for_create_select(&tmp_table); if (!tmp_field) DBUG_RETURN(NULL); |