database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-7101: SAFE_MUTEX lock order warning when reusing wait_for_commit mutex

Browse Source 
In SAFE_MUTEX builds, reset the wait_for_commit mutex (destroy and
re-initialise), so that SAFE_MUTEX lock order check does not become
confused when the mutex is re-used for a different purpose.
This commit is contained in:
Kristian Nielsen
2014-11-13 09:19:12 +01:00
parent 0f32299437
commit fbc8768ce5
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@ -6342,6 +6342,18 @@ wait_for_commit::reinit()
opaque_pointer= NULL;
wakeup_error= 0;
wakeup_subsequent_commits_running= false;
#ifdef SAFE_MUTEX
/*
When using SAFE_MUTEX, the ordering between taking the LOCK_wait_commit
mutexes is checked. This causes a problem when we re-use a mutex, as then
the expected locking order may change.
So in this case, do a re-init of the mutex. In release builds, we want to
avoid the overhead of a re-init though.
*/
mysql_mutex_destroy(&LOCK_wait_commit);
mysql_mutex_init(key_LOCK_wait_commit, &LOCK_wait_commit, MY_MUTEX_INIT_FAST);
#endif
}