diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-08 08:44:18 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-08 08:44:18 +0200 |
| commit | 26d913a743d609bcd82339bad196b74daf1d2fa6 (patch) | |
| tree | c4838f3d8c5450153887a1d832160b5195be7a45 | |
| parent | 033f8d13ce6bc2a8003ada5bb51b28b47cd64949 (diff) | |
| download | mariadb-git-26d913a743d609bcd82339bad196b74daf1d2fa6.tar.gz | |
Update wsrep-lib
| -rw-r--r-- | sql/wsrep_client_service.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_condition_variable.h | 2 | ||||
| m--------- | wsrep-lib | 0 |
3 files changed, 2 insertions, 2 deletions
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 -Subproject 515ac816f98329c0227d0060cc9339c88981083 +Subproject a93955ddeef5989505cbb3a9f8bb12434146256 |