Commit 2106fed8 authored by sjaakola's avatar sjaakola Committed by Nirbhay Choubey

Refs codership/mysql-wsrep#113

- changed BF thread's MDL wait to never timeout
- all explicit locks are now honored by BF threads
parent f9805e4c
...@@ -1449,7 +1449,7 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout, ...@@ -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); wait_result= mysql_cond_wait(&m_COND_wait_status, &m_LOCK_wait_status);
} }
else else
#endif #endif /* WITH_WSREP */
wait_result= mysql_cond_timedwait(&m_COND_wait_status, &m_LOCK_wait_status, wait_result= mysql_cond_timedwait(&m_COND_wait_status, &m_LOCK_wait_status,
abs_timeout); abs_timeout);
} }
...@@ -3380,12 +3380,9 @@ bool MDL_context::wsrep_has_explicit_locks() ...@@ -3380,12 +3380,9 @@ bool MDL_context::wsrep_has_explicit_locks()
Ticket_iterator it(m_tickets[MDL_EXPLICIT]); Ticket_iterator it(m_tickets[MDL_EXPLICIT]);
while ((ticket = it++)) while ((ticket = it++))
{
if (ticket->m_type == MDL_EXCLUSIVE)
{ {
return true; return true;
} }
}
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment