database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-04 17:23:46 +03:00
Code Activity

MDEV-22998 Free thd->mem_root at applier commit or rollback.

Browse Source
This commit is contained in:
Teemu Ollakka
2020-07-24 15:17:59 +03:00
committed by Jan Lindström
parent 468e56bfde
commit 3d76af0814
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/wsrep_high_priority_service.cc
View File

@@ -276,6 +276,8 @@ int Wsrep_high_priority_service::append_fragment_and_commit(
m_thd->wsrep_cs().after_applying(); m_thd->wsrep_cs().after_applying();
m_thd->mdl_context.release_transactional_locks(); m_thd->mdl_context.release_transactional_locks();
free_root(m_thd->mem_root, MYF(MY_KEEP_PREALLOC));
thd_proc_info(m_thd, "wsrep applier committed"); thd_proc_info(m_thd, "wsrep applier committed");
DBUG_RETURN(ret); DBUG_RETURN(ret);
@@ -334,6 +336,8 @@ int Wsrep_high_priority_service::commit(const wsrep::ws_handle& ws_handle,
thd->lex->sql_command= SQLCOM_END; thd->lex->sql_command= SQLCOM_END;
free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
must_exit_= check_exit_status(); must_exit_= check_exit_status();
DBUG_RETURN(ret); DBUG_RETURN(ret);
} }
@@ -346,6 +350,9 @@ int Wsrep_high_priority_service::rollback(const wsrep::ws_handle& ws_handle,
int ret= (trans_rollback_stmt(m_thd) || trans_rollback(m_thd)); int ret= (trans_rollback_stmt(m_thd) || trans_rollback(m_thd));
m_thd->mdl_context.release_transactional_locks(); m_thd->mdl_context.release_transactional_locks();
m_thd->mdl_context.release_explicit_locks(); m_thd->mdl_context.release_explicit_locks();
free_root(m_thd->mem_root, MYF(MY_KEEP_PREALLOC));
DBUG_RETURN(ret); DBUG_RETURN(ret);
} }