database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21096
This commit is contained in:
kroki/tomash@moonlight.intranet
2006-08-29 17:00:46 +04:00
parent 109d58af66 2a4221489b
commit 1140b1a613
3 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -214,7 +214,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
bool some_tables_deleted=0, tmp_table_deleted=0, foreign_key_error=0;
DBUG_ENTER("mysql_rm_table_part2");
if (lock_table_names(thd, tables))
if (!drop_temporary && lock_table_names(thd, tables))
DBUG_RETURN(1);
for (table=tables ; table ; table=table->next)
@ -311,7 +311,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
}
}
unlock_table_names(thd, tables);
if (!drop_temporary)
unlock_table_names(thd, tables);
DBUG_RETURN(error);
}