Skip to content

M
MariaDB
Commit 7df32ac6 authored by unknown's avatar unknown
Browse files
Options

after merge fix

parent ff8c8fa1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sql/item_subselect.cc
View file @ 7df32ac6
...@@ -543,7 +543,7 @@ Item_in_subselect::single_value_transformer(JOIN *join, ...@@ -543,7 +543,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
if (item->fix_fields(thd, join->tables_list, &item)) if (item->fix_fields(thd, join->tables_list, &item))
{ {
DBUG_RETURN(ERROR); DBUG_RETURN(RES_ERROR);
} }
subs= new Item_singlerow_subselect(thd, select_lex); subs= new Item_singlerow_subselect(thd, select_lex);
} }
...@@ -562,11 +562,11 @@ Item_in_subselect::single_value_transformer(JOIN *join, ...@@ -562,11 +562,11 @@ Item_in_subselect::single_value_transformer(JOIN *join,
if (left_expr->fix_fields(thd, up->get_table_list(), 0)) if (left_expr->fix_fields(thd, up->get_table_list(), 0))
{ {
thd->lex.current_select= current; thd->lex.current_select= current;
DBUG_RETURN(ERROR); DBUG_RETURN(RES_ERROR);
} }
thd->lex.current_select= current; thd->lex.current_select= current;
substitution= (*func)(left_expr, subs); substitution= (*func)(left_expr, subs);
DBUG_RETURN(OK); DBUG_RETURN(RES_OK);
} }
if (!substitution) if (!substitution)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7