mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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:
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)

2
sql/wsrep_condition_variable.h
View file

@ -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:

2
wsrep-lib

@ -1 +1 @@
Subproject commit 515ac816f98329c0227d0060cc9339c889810834
Subproject commit a93955ddeef5989505cbb3a9f8bb124341462569