Commit 26d913a7 authored by Jan Lindström's avatar Jan Lindström

Update wsrep-lib

parent 033f8d13
......@@ -74,7 +74,7 @@ bool Wsrep_client_service::interrupted(
Locking order is:
1) LOCK_thd_data
2) LOCK_thd_kill */
mysql_mutex_assert_owner(static_cast<mysql_mutex_t*>(lock.mutex().native()));
mysql_mutex_assert_owner(static_cast<mysql_mutex_t*>(lock.mutex()->native()));
mysql_mutex_lock(&m_thd->LOCK_thd_kill);
bool ret= (m_thd->killed != NOT_KILLED);
if (ret)
......
......@@ -44,7 +44,7 @@ class Wsrep_condition_variable : public wsrep::condition_variable
void wait(wsrep::unique_lock<wsrep::mutex>& lock)
{
mysql_mutex_t* mutex= static_cast<mysql_mutex_t*>(lock.mutex().native());
mysql_mutex_t* mutex= static_cast<mysql_mutex_t*>(lock.mutex()->native());
mysql_cond_wait(&m_cond, mutex);
}
private:
......
Subproject commit 515ac816f98329c0227d0060cc9339c889810834
Subproject commit a93955ddeef5989505cbb3a9f8bb124341462569
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