diff options
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 6a868f07ce9..511d9fa6677 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5288,6 +5288,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, /* DISCARD/IMPORT TABLESPACE is always alone in an ALTER TABLE */ if (alter_info->tablespace_op != NO_TABLESPACE_OP) + /* Conditionally writes to binlog. */ DBUG_RETURN(mysql_discard_or_import_tablespace(thd,table_list, alter_info->tablespace_op)); strxnmov(new_name_buff, sizeof (new_name_buff) - 1, mysql_data_home, "/", db, @@ -5443,10 +5444,10 @@ view_err: !table->s->tmp_table) // no need to touch frm { error=0; + VOID(pthread_mutex_lock(&LOCK_open)); if (new_name != table_name || new_db != db) { thd->proc_info="rename"; - VOID(pthread_mutex_lock(&LOCK_open)); /* Then do a 'simple' rename of the table */ error=0; if (!access(new_name_buff,F_OK)) @@ -5469,7 +5470,6 @@ view_err: error= -1; } } - VOID(pthread_mutex_unlock(&LOCK_open)); } if (!error) @@ -5478,16 +5478,12 @@ view_err: case LEAVE_AS_IS: break; case ENABLE: - VOID(pthread_mutex_lock(&LOCK_open)); wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN); - VOID(pthread_mutex_unlock(&LOCK_open)); error= table->file->enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); /* COND_refresh will be signaled in close_thread_tables() */ break; case DISABLE: - VOID(pthread_mutex_lock(&LOCK_open)); wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN); - VOID(pthread_mutex_unlock(&LOCK_open)); error=table->file->disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); /* COND_refresh will be signaled in close_thread_tables() */ break; @@ -5512,6 +5508,7 @@ view_err: table->file->print_error(error, MYF(0)); error= -1; } + VOID(pthread_mutex_unlock(&LOCK_open)); table_list->table=0; // For query cache query_cache_invalidate3(thd, table_list, 0); DBUG_RETURN(error); @@ -6512,7 +6509,7 @@ end_temporary: thd->some_tables_deleted=0; DBUG_RETURN(FALSE); - err1: +err1: if (new_table) { /* close_temporary_table() frees the new_table pointer. */ @@ -6521,7 +6518,7 @@ end_temporary: else VOID(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP)); - err: +err: DBUG_RETURN(TRUE); } /* mysql_alter_table */ |