diff options
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 79e894f5a7f..7004c32e602 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -241,7 +241,7 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl, /* Error's in 'new' will be detected after loop */ Item_type_holder *new_holder= new (thd->mem_root) Item_type_holder(thd, - &item->name, + item, holders[pos].type_handler(), &holders[pos]/*Type_all_attributes*/, holders[pos].get_maybe_null()); @@ -291,8 +291,8 @@ int table_value_constr::save_explain_data_intern(THD *thd, explain->select_id= select_lex->select_number; explain->select_type= select_lex->type; explain->linkage= select_lex->linkage; - explain->using_temporary= NULL; - explain->using_filesort= NULL; + explain->using_temporary= false; + explain->using_filesort= false; /* Setting explain->message means that all other members are invalid */ explain->message= message; @@ -479,7 +479,7 @@ bool Item_func_in::create_value_list_for_tvc(THD *thd, return true; } } - else if (tvc_value->push_back(args[i])) + else if (tvc_value->push_back(args[i]->real_item())) return true; if (values->push_back(tvc_value, thd->mem_root)) |