diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2015-05-10 21:49:36 +0300 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 21:37:17 -0400 |
| commit | 2106fed865f6827418b16efcf6dd8368c3a092c5 (patch) | |
| tree | 56223cc13ead5800e297b904825522042b4cc6a0 /sql/mdl.cc | |
| parent | f9805e4c984d251fec76f39bcd6a675e6cf5e6df (diff) | |
| download | mariadb-git-2106fed865f6827418b16efcf6dd8368c3a092c5.tar.gz | |
Refs codership/mysql-wsrep#113
- changed BF thread's MDL wait to never timeout
- all explicit locks are now honored by BF threads
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index e18194e8663..8c446e5d65f 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1449,7 +1449,7 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout, wait_result= mysql_cond_wait(&m_COND_wait_status, &m_LOCK_wait_status); } else -#endif +#endif /* WITH_WSREP */ wait_result= mysql_cond_timedwait(&m_COND_wait_status, &m_LOCK_wait_status, abs_timeout); } @@ -3381,10 +3381,7 @@ bool MDL_context::wsrep_has_explicit_locks() while ((ticket = it++)) { - if (ticket->m_type == MDL_EXCLUSIVE) - { - return true; - } + return true; } return false; |