Commit 462dba1b authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

fixed memory leak (now JOIN cleaning procedure always called)

parent efce59fc
...@@ -1514,7 +1514,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array, ...@@ -1514,7 +1514,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
conds, og_num, order, group, having, proc_param, conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied)) select_lex, unit, tables_and_fields_initied))
{ {
DBUG_RETURN(-1); goto err;
} }
} }
join->select_options= select_options; join->select_options= select_options;
...@@ -1529,15 +1529,12 @@ mysql_select(THD *thd, Item ***rref_pointer_array, ...@@ -1529,15 +1529,12 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
conds, og_num, order, group, having, proc_param, conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied)) select_lex, unit, tables_and_fields_initied))
{ {
DBUG_RETURN(-1); goto err;
} }
} }
if ((err= join->optimize())) if ((err= join->optimize()))
{ {
if (err == -1)
DBUG_RETURN(join->error);
DBUG_ASSERT(err == 1);
goto err; // 1 goto err; // 1
} }
......
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