diff options
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 021f3f07ad5..cf03288860f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -866,7 +866,7 @@ bool close_cached_table(THD *thd,TABLE *table) if (table) { - DBUG_PRINT("enter",("table: %s", table->table_name)); + DBUG_PRINT("enter",("table: %s", table->real_name)); VOID(table->file->extra(HA_EXTRA_FORCE_REOPEN)); // Close all data files /* Mark all tables that are in use as 'old' */ mysql_lock_abort(thd,table); // end threads waiting on lock @@ -874,7 +874,7 @@ bool close_cached_table(THD *thd,TABLE *table) #if defined(USING_TRANSACTIONS) || defined( __WIN__) || defined( __EMX__) || !defined(OS2) /* Wait until all there are no other threads that has this table open */ while (remove_table_from_cache(thd,table->table_cache_key, - table->table_name)) + table->real_name)) { dropping_tables++; (void) pthread_cond_wait(&COND_refresh,&LOCK_open); @@ -882,7 +882,7 @@ bool close_cached_table(THD *thd,TABLE *table) } #else (void) remove_table_from_cache(thd,table->table_cache_key, - table->table_name); + table->real_name); #endif /* When lock on LOCK_open is freed other threads can continue */ pthread_cond_broadcast(&COND_refresh); @@ -932,7 +932,7 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table, { char* backup_dir = thd->lex.backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; - char* table_name = table->name; + char* table_name = table->real_name; char* db = thd->db ? thd->db : table->db; if (fn_format_relative_to_data_home(src_path, table_name, backup_dir, |