1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the fix from MySQL-5.1 that's not necessary in 5.3

Browse Source
This commit is contained in:
Sergei Golubchik 2014-02-13 20:18:07 +01:00
parent 913beda8c8
commit 642495345f
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item_subselect.cc
View File

@ -2796,7 +2796,7 @@ subselect_single_select_engine(THD *thd_arg, st_select_lex *select,
select_result_interceptor *result_arg, select_result_interceptor *result_arg,
Item_subselect *item_arg) Item_subselect *item_arg)
:subselect_engine(thd_arg, item_arg, result_arg), :subselect_engine(thd_arg, item_arg, result_arg),
prepared(0), executed(0), optimize_error(0), prepared(0), executed(0),
select_lex(select), join(0) select_lex(select), join(0)
{ {
select_lex->master_unit()->item= item_arg; select_lex->master_unit()->item= item_arg;
@ -2810,7 +2810,7 @@ int subselect_single_select_engine::get_identifier()
void subselect_single_select_engine::cleanup() void subselect_single_select_engine::cleanup()
{ {
DBUG_ENTER("subselect_single_select_engine::cleanup"); DBUG_ENTER("subselect_single_select_engine::cleanup");
prepared= executed= optimize_error= 0; prepared= executed= 0;
join= 0; join= 0;
result->cleanup(); result->cleanup();
select_lex->uncacheable&= ~UNCACHEABLE_DEPENDENT_INJECTED; select_lex->uncacheable&= ~UNCACHEABLE_DEPENDENT_INJECTED;
@ -3039,9 +3039,6 @@ int subselect_single_select_engine::exec()
{ {
DBUG_ENTER("subselect_single_select_engine::exec"); DBUG_ENTER("subselect_single_select_engine::exec");
if (optimize_error)
DBUG_RETURN(1);
char const *save_where= thd->where; char const *save_where= thd->where;
SELECT_LEX *save_select= thd->lex->current_select; SELECT_LEX *save_select= thd->lex->current_select;
thd->lex->current_select= select_lex; thd->lex->current_select= select_lex;
@ -3054,7 +3051,7 @@ int subselect_single_select_engine::exec()
if (join->optimize()) if (join->optimize())
{ {
thd->where= save_where; thd->where= save_where;
executed= optimize_error= 1; executed= 1;
thd->lex->current_select= save_select; thd->lex->current_select= save_select;
DBUG_RETURN(join->error ? join->error : 1); DBUG_RETURN(join->error ? join->error : 1);
} }

1
sql/item_subselect.h
View File

@ -764,7 +764,6 @@ class subselect_single_select_engine: public subselect_engine
{ {
bool prepared; /* simple subselect is prepared */ bool prepared; /* simple subselect is prepared */
bool executed; /* simple subselect is executed */ bool executed; /* simple subselect is executed */
bool optimize_error; /* simple subselect optimization failed */
st_select_lex *select_lex; /* corresponding select_lex */ st_select_lex *select_lex; /* corresponding select_lex */
JOIN * join; /* corresponding JOIN structure */ JOIN * join; /* corresponding JOIN structure */
public: public: