diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-10-05 13:55:51 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-10-05 13:55:51 +0400 |
| commit | d0762ef5117c8dbf2b2af88d2afd39cb4c5c04bf (patch) | |
| tree | 699427bad482b67b8aedcdc1ad28bdfd6c76ec3e /sql/item_subselect.cc | |
| parent | 32d770fba383cd923d4179616efd3e6562724a10 (diff) | |
| parent | fcd99c156ba85af9af11c41a0ad8c5abe25e2b8e (diff) | |
| download | mariadb-git-d0762ef5117c8dbf2b2af88d2afd39cb4c5c04bf.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index e4d3d1bd43e..0c4b96f7be0 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1690,7 +1690,7 @@ subselect_single_select_engine(st_select_lex *select, select_subselect *result_arg, Item_subselect *item_arg) :subselect_engine(item_arg, result_arg), - prepared(0), optimized(0), executed(0), + prepared(0), optimized(0), executed(0), optimize_error(0), select_lex(select), join(0) { select_lex->master_unit()->item= item_arg; @@ -1700,7 +1700,7 @@ subselect_single_select_engine(st_select_lex *select, void subselect_single_select_engine::cleanup() { DBUG_ENTER("subselect_single_select_engine::cleanup"); - prepared= optimized= executed= 0; + prepared= optimized= executed= optimize_error= 0; join= 0; result->cleanup(); DBUG_VOID_RETURN; @@ -1892,6 +1892,10 @@ int join_read_next_same_or_null(READ_RECORD *info); int subselect_single_select_engine::exec() { DBUG_ENTER("subselect_single_select_engine::exec"); + + if (optimize_error) + DBUG_RETURN(1); + char const *save_where= thd->where; SELECT_LEX *save_select= thd->lex->current_select; thd->lex->current_select= select_lex; @@ -1899,12 +1903,15 @@ int subselect_single_select_engine::exec() { SELECT_LEX_UNIT *unit= select_lex->master_unit(); + DBUG_EXECUTE_IF("bug11747970_simulate_error", + DBUG_SET("+d,bug11747970_raise_error");); + optimized= 1; unit->set_limit(unit->global_parameters); if (join->optimize()) { thd->where= save_where; - executed= 1; + optimize_error= 1; thd->lex->current_select= save_select; DBUG_RETURN(join->error ? join->error : 1); } |