diff options
| author | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-20 22:30:34 -0400 |
|---|---|---|
| committer | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-20 22:30:34 -0400 |
| commit | 31ebc6ef71afaf4605ab5d00ddaf8d548683212d (patch) | |
| tree | 4e149a0dc3912fa94823eb5974783426d4c95306 /sql | |
| parent | a3fe765249cd6b23dcd59a9bda3f310606877dc8 (diff) | |
| download | mariadb-git-31ebc6ef71afaf4605ab5d00ddaf8d548683212d.tar.gz | |
Fix merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b0e8319fbb7..a40da9e0525 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -228,26 +228,12 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, continue; // removed temporary table } - abort_locked_tables(thd,db,table->real_name); - flags= RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG; - remove_table_from_cache(thd,db,table->real_name,flags); - drop_locked_tables(thd,db,table->real_name); - if (thd->killed) - DBUG_RETURN(-1); - alias= (lower_case_table_names == 2) ? table->alias : table->real_name; - /* remove form file and isam files */ - strxmov(path, mysql_data_home, "/", db, "/", alias, reg_ext, NullS); - (void) unpack_filename(path,path); error=0; if (!drop_temporary) { abort_locked_tables(thd,db,table->real_name); - while (remove_table_from_cache(thd,db,table->real_name) && !thd->killed) - { - dropping_tables++; - (void) pthread_cond_wait(&COND_refresh,&LOCK_open); - dropping_tables--; - } + flags= RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG; + remove_table_from_cache(thd,db,table->real_name,flags); drop_locked_tables(thd,db,table->real_name); if (thd->killed) DBUG_RETURN(-1); |