Commit b1742197 authored by dlenev@mysql.com's avatar dlenev@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0
parents 52666fca 48fcadf3
...@@ -268,13 +268,8 @@ int mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) ...@@ -268,13 +268,8 @@ int mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *orig_table_list)
unit->cleanup(); unit->cleanup();
} }
else else
{
free_tmp_table(thd, table);
unit->cleanup(); unit->cleanup();
}
lex->current_select= save_current_select; lex->current_select= save_current_select;
if (res)
free_tmp_table(thd, table);
} }
return res; return res;
} }
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