diff options
| author | bell@laptop.sanja.is.com.ua <> | 2003-10-07 01:28:15 +0300 |
|---|---|---|
| committer | bell@laptop.sanja.is.com.ua <> | 2003-10-07 01:28:15 +0300 |
| commit | ccaeb61f8b35d8462a4865294f3189cd45b23654 (patch) | |
| tree | 78d10ac9ca8f6b410a4745e7b35c2a9b522a3b19 /sql/item_subselect.cc | |
| parent | e1b53fdd42848fc1b0f0ea06dadf54bc6fbad16a (diff) | |
| download | mariadb-git-ccaeb61f8b35d8462a4865294f3189cd45b23654.tar.gz | |
after merge fix
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 324b745778a..23845ce41ff 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -543,7 +543,7 @@ Item_in_subselect::single_value_transformer(JOIN *join, if (item->fix_fields(thd, join->tables_list, &item)) { - DBUG_RETURN(ERROR); + DBUG_RETURN(RES_ERROR); } subs= new Item_singlerow_subselect(thd, select_lex); } @@ -562,11 +562,11 @@ Item_in_subselect::single_value_transformer(JOIN *join, if (left_expr->fix_fields(thd, up->get_table_list(), 0)) { thd->lex.current_select= current; - DBUG_RETURN(ERROR); + DBUG_RETURN(RES_ERROR); } thd->lex.current_select= current; substitution= (*func)(left_expr, subs); - DBUG_RETURN(OK); + DBUG_RETURN(RES_OK); } if (!substitution) |