1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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
This commit is contained in:
unknown
2003-01-28 14:37:12 +01:00
5 changed files with 49 additions and 21 deletions

View File

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