database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Update wsrep-lib

Browse Source
This commit is contained in:
Jan Lindström
2021-01-08 08:44:18 +02:00
parent 033f8d13ce
commit 26d913a743
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/wsrep_client_service.cc
View File

@ -74,7 +74,7 @@ bool Wsrep_client_service::interrupted(
Locking order is: Locking order is:
1) LOCK_thd_data 1) LOCK_thd_data
2) LOCK_thd_kill */ 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); mysql_mutex_lock(&m_thd->LOCK_thd_kill);
bool ret= (m_thd->killed != NOT_KILLED); bool ret= (m_thd->killed != NOT_KILLED);
if (ret) if (ret)

2
sql/wsrep_condition_variable.h
View File

@ -44,7 +44,7 @@ public:
void wait(wsrep::unique_lock<wsrep::mutex>& lock) 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); mysql_cond_wait(&m_cond, mutex);
} }
private: private:

2
wsrep-lib

Submodule wsrep-lib updated: 515ac816f9...a93955ddee