mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
revision of fix_fields() calls (BUG2838)
mysql-test/r/subselect.result: test suite for BUG#2838 mysql-test/t/subselect.test: test suite for BUG#2838 sql/item.cc: revision of fix_fields() calls removed unnecessary variabl, and used correct last parameter of fix_fields() sql/item_cmpfunc.cc: revision of fix_fields() calls (BUG#2838) sql/item_func.cc: revision of fix_fields() calls sql/item_row.cc: changed for efficience (and to be similar for Item_func::fix_fields) sql/item_subselect.cc: fixed last arguments for fix_fields call sql/item_sum.cc: layout fixed revision of fix_fields() calls sql/log_event.cc: revision of fix_fields() calls sql/set_var.cc: revision of fix_fields() calls sql/sql_base.cc: revision of fix_fields() calls sql/sql_class.cc: revision of fix_fields() calls sql/sql_handler.cc: revision of fix_fields() calls
This commit is contained in:
@@ -597,7 +597,8 @@ Item_in_subselect::single_value_transformer(JOIN *join,
|
||||
select_lex->item_list.empty();
|
||||
select_lex->item_list.push_back(item);
|
||||
|
||||
if (item->fix_fields(thd_tmp, join->tables_list, &item))
|
||||
if (item->fix_fields(thd_tmp, join->tables_list,
|
||||
select_lex->item_list.head_ref()))
|
||||
{
|
||||
DBUG_RETURN(RES_ERROR);
|
||||
}
|
||||
@@ -819,7 +820,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
|
||||
else
|
||||
{
|
||||
join->conds= and_items(join->conds, item);
|
||||
if (join->conds->fix_fields(thd_tmp, join->tables_list, &join->having))
|
||||
if (join->conds->fix_fields(thd_tmp, join->tables_list, &join->conds))
|
||||
DBUG_RETURN(RES_ERROR);
|
||||
}
|
||||
DBUG_RETURN(RES_OK);
|
||||
|
Reference in New Issue
Block a user