diff options
| author | unknown <dlenev@mysql.com> | 2004-12-19 12:52:18 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-12-19 12:52:18 +0300 |
| commit | 0e25a6f090b0be336edd1c7b8ae4b2680a080175 (patch) | |
| tree | 6c56c13558fcdb78899554909875590c2fe233ca /sql | |
| parent | 2aa5d925373576715d6cd13d61dd0162ea59a937 (diff) | |
| parent | 5bc79c0c837ab9621824122e235b335fcd625c8b (diff) | |
| download | mariadb-git-0e25a6f090b0be336edd1c7b8ae4b2680a080175.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_derived.cc | 5 |
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; } |