1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

Merge 10.7 into 10.8

This commit is contained in:
Marko Mäkelä
2022-02-23 16:42:59 +02:00
15 changed files with 57 additions and 29 deletions

View File

@@ -710,8 +710,8 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
/* wsrep-lib */
m_wsrep_next_trx_id(WSREP_UNDEFINED_TRX_ID),
m_wsrep_mutex(LOCK_thd_data),
m_wsrep_cond(COND_wsrep_thd),
m_wsrep_mutex(&LOCK_thd_data),
m_wsrep_cond(&COND_wsrep_thd),
m_wsrep_client_service(this, m_wsrep_client_state),
m_wsrep_client_state(this,
m_wsrep_mutex,