diff --git a/sql/wsrep_client_service.cc b/sql/wsrep_client_service.cc
index 934a9701b41..245fc1487ca 100644
--- a/sql/wsrep_client_service.cc
+++ b/sql/wsrep_client_service.cc
@@ -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)
diff --git a/sql/wsrep_condition_variable.h b/sql/wsrep_condition_variable.h
index 4412154e67b..6ad53a3086c 100644
--- a/sql/wsrep_condition_variable.h
+++ b/sql/wsrep_condition_variable.h
@@ -44,7 +44,7 @@ public:
 
   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:
diff --git a/wsrep-lib b/wsrep-lib
index 515ac816f98..a93955ddeef 160000
--- a/wsrep-lib
+++ b/wsrep-lib
@@ -1 +1 @@
-Subproject commit 515ac816f98329c0227d0060cc9339c889810834
+Subproject commit a93955ddeef5989505cbb3a9f8bb124341462569