diff options
| author | unknown <istruewing@chilla.local> | 2007-07-22 19:08:25 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-07-22 19:08:25 +0200 |
| commit | 0a6543687c9fddc6a348899c114892a4144ffc3f (patch) | |
| tree | ed2c74e06a5c6d46e0b4e2ed7abbd6c3a97edee0 /sql/sql_table.cc | |
| parent | 47507276aa628ab51878ca36f0af47541ac04755 (diff) | |
| parent | 524a40a98265ded292739c6add21ad3fb429dc27 (diff) | |
| download | mariadb-git-0a6543687c9fddc6a348899c114892a4144ffc3f.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-amain
into chilla.local:/home/mydev/mysql-5.0-axmrg
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e02595836ca..7db79543016 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3791,11 +3791,9 @@ view_err: { VOID(pthread_mutex_lock(&LOCK_open)); wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN); - table->file->external_lock(thd, F_WRLCK); + VOID(pthread_mutex_unlock(&LOCK_open)); alter_table_manage_keys(table, table->file->indexes_are_disabled(), alter_info->keys_onoff); - table->file->external_lock(thd, F_UNLCK); - VOID(pthread_mutex_unlock(&LOCK_open)); error= ha_commit_stmt(thd); if (ha_commit(thd)) error= 1; |