summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorunknown <dlenev@brandersnatch.localdomain>2004-12-19 12:51:40 +0300
committerunknown <dlenev@brandersnatch.localdomain>2004-12-19 12:51:40 +0300
commit5bc79c0c837ab9621824122e235b335fcd625c8b (patch)
treec3909890eafc56e4e19ee4d5fff8709631e4b1bf /sql/sql_derived.cc
parente517bb0da3c578d4d68fb4cb9a5b5d4735a3b236 (diff)
downloadmariadb-git-5bc79c0c837ab9621824122e235b335fcd625c8b.tar.gz
Small cleanup of derived tables handling.
We should not call free_tmp_table() for derived table in mysql_derived_filling(), since by this moment this table is already registered in THD::derived_tables list and thus free_tmp_table() will be called for it automatically in close_thread_tables(). sql/sql_derived.cc: We should not call free_tmp_table() for derived table in mysql_derived_filling(), since by this moment this table is already registered in THD::derived_tables list and thus free_tmp_table() will be called for it automatically in close_thread_tables().
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 7cea1c6fcee..1d4b911bb65 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -268,13 +268,8 @@ int mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *orig_table_list)
unit->cleanup();
}
else
- {
- free_tmp_table(thd, table);
unit->cleanup();
- }
lex->current_select= save_current_select;
- if (res)
- free_tmp_table(thd, table);
}
return res;
}