database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge with 5.1

Browse Source
This commit is contained in:
Sergei Golubchik
2010-09-16 09:58:57 +02:00
parent 41e66d57d5 b4b6494643
commit b170b126b0
34 changed files with 383 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@@ -6976,8 +6976,14 @@ view_err:
Workaround InnoDB ending the transaction when the table instance
is unlocked/closed (close_cached_table below), otherwise the trx
state will differ between the server and storage engine layers.
We have to unlock LOCK_open here as otherwise we can get deadlock
in wait_if_global_readlock(). This is still safe as we have a
name lock on the table object.
*/
VOID(pthread_mutex_unlock(&LOCK_open));
ha_autocommit_or_rollback(thd, 0);
VOID(pthread_mutex_lock(&LOCK_open));
/*
Then do a 'simple' rename of the table. First we need to close all