VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 11:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MDEV-15532 after-merge fixes from Monty

Browse Source 
The Galera tests were massively failing with debug assertions.
This commit is contained in:
Marko Mäkelä
2020-12-02 16:16:29 +02:00
parent 589cf8dbf3
commit 24ec8eaf66
15 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/wsrep_high_priority_service.cc
View File

@ -274,7 +274,7 @@ int Wsrep_high_priority_service::append_fragment_and_commit(
ret= ret || trans_commit(m_thd);
m_thd->wsrep_cs().after_applying();
m_thd->mdl_context.release_transactional_locks();
m_thd->release_transactional_locks();
free_root(m_thd->mem_root, MYF(MY_KEEP_PREALLOC));
@ -316,7 +316,7 @@ int Wsrep_high_priority_service::commit(const wsrep::ws_handle& ws_handle,
m_rgi->cleanup_context(thd, 0);
}
m_thd->mdl_context.release_transactional_locks();
m_thd->release_transactional_locks();
thd_proc_info(thd, "wsrep applier committed");
@ -354,7 +354,7 @@ int Wsrep_high_priority_service::rollback(const wsrep::ws_handle& ws_handle,
DBUG_ENTER("Wsrep_high_priority_service::rollback");
m_thd->wsrep_cs().prepare_for_ordering(ws_handle, ws_meta, false);
int ret= (trans_rollback_stmt(m_thd) || trans_rollback(m_thd));
m_thd->mdl_context.release_transactional_locks();
m_thd->release_transactional_locks();
m_thd->mdl_context.release_explicit_locks();
free_root(m_thd->mem_root, MYF(MY_KEEP_PREALLOC));