database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge chilla.local:/home/mydev/mysql-5.1-ateam

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2007-07-21 03:10:23 +02:00
parent 43a6c7804b b012fca45a
commit 36b431d869
13 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@@ -6330,11 +6330,9 @@ view_err:
{
VOID(pthread_mutex_lock(&LOCK_open));
wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
table->file->ha_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->ha_external_lock(thd, F_UNLCK);
VOID(pthread_mutex_unlock(&LOCK_open));
error= ha_commit_stmt(thd);
if (ha_commit(thd))
error= 1;