1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

auto-merge

This commit is contained in:
Tatiana A. Nurnberg
2009-06-05 01:30:08 +02:00
3 changed files with 13 additions and 0 deletions

View File

@ -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;