diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-05 01:30:08 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-05 01:30:08 +0200 |
| commit | 406f018d33bdd09a44983691d47ac53c3d8aa502 (patch) | |
| tree | 5eca86911d30a3fd95ab13979125348abf5128df /sql/sql_select.cc | |
| parent | 5fb8b93e98a57ee55143b8b1de9cefeaf6d7bb95 (diff) | |
| parent | e34085fe13c7572ae355b456e5d9eb751bacdf7f (diff) | |
| download | mariadb-git-406f018d33bdd09a44983691d47ac53c3d8aa502.tar.gz | |
auto-merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fad533986d6..06776f5f7b3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10602,6 +10602,9 @@ free_tmp_table(THD *thd, TABLE *entry) save_proc_info=thd->proc_info; thd_proc_info(thd, "removing tmp table"); + // Release latches since this can take a long time + ha_release_temporary_latches(thd); + if (entry->file) { if (entry->db_stat) @@ -10647,6 +10650,10 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param, table->file->print_error(error,MYF(0)); DBUG_RETURN(1); } + + // Release latches since this can take a long time + ha_release_temporary_latches(thd); + new_table= *table; share= *table->s; new_table.s= &share; |