diff options
author | unknown <serg@serg.mysql.com> | 2003-01-28 14:37:12 +0100 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2003-01-28 14:37:12 +0100 |
commit | a29d85072d7f6cd45586e0931affd053a1db94bd (patch) | |
tree | 1b808d58d99cba031cd281e3a0505c620a9bc321 /sql/sql_table.cc | |
parent | 2d9a417d56f03f1af44649a0c3f5d757f717fffc (diff) | |
parent | d490b56ed1d309cad0ace21a8542983702750f62 (diff) | |
download | mariadb-git-a29d85072d7f6cd45586e0931affd053a1db94bd.tar.gz |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4c0ab15edf7..a4ba3617e67 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -74,7 +74,7 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists) } error=mysql_rm_table_part2(thd,tables,if_exists,0); - err: + err: pthread_mutex_unlock(&LOCK_open); VOID(pthread_cond_broadcast(&COND_refresh)); // Signal to refresh @@ -136,6 +136,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, for (table=tables ; table ; table=table->next) { char *db=table->db ? table->db : thd->db; + mysql_ha_closeall(thd, table, 1); if (!close_temporary_table(thd, db, table->real_name)) { tmp_table_deleted=1; |