diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-08-29 17:00:46 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-08-29 17:00:46 +0400 |
| commit | eaeb3d4f2c3ad7d853ffa2f28e7086b02e41df9c (patch) | |
| tree | 5ac112e9ed8335bdeafb4267a70be5d51270cf14 /sql | |
| parent | 2416a453eb21f56483865e42cbe568f0cf5a609e (diff) | |
| parent | 4ed1ce6f583751c56c699017e58717e2bf23f53d (diff) | |
| download | mariadb-git-eaeb3d4f2c3ad7d853ffa2f28e7086b02e41df9c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21096
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a5cb0d45664..da66b556b5e 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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); } |