diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-01 14:42:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-01 14:42:51 +0300 |
| commit | 50a11f396af81aac6d5f51e8278ec9a7fa17e7c8 (patch) | |
| tree | 1a695f030aa737b200e9271f9403971f8a571849 /sql/wsrep_high_priority_service.cc | |
| parent | 842da858b6c5b619bb5395ef4216f7e675b0f3a0 (diff) | |
| parent | 9216114ce729733e6b0c4ce952bfdf57595ff387 (diff) | |
| download | mariadb-git-50a11f396af81aac6d5f51e8278ec9a7fa17e7c8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_high_priority_service.cc')
| -rw-r--r-- | sql/wsrep_high_priority_service.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc index de0aab4b81a..8f52938f9ed 100644 --- a/sql/wsrep_high_priority_service.cc +++ b/sql/wsrep_high_priority_service.cc @@ -292,6 +292,8 @@ int Wsrep_high_priority_service::append_fragment_and_commit( ret= ret || (m_thd->wsrep_cs().after_applying(), 0); 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"); DBUG_RETURN(ret); @@ -350,6 +352,8 @@ int Wsrep_high_priority_service::commit(const wsrep::ws_handle& ws_handle, thd->lex->sql_command= SQLCOM_END; + free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC)); + must_exit_= check_exit_status(); DBUG_RETURN(ret); } @@ -370,6 +374,9 @@ int Wsrep_high_priority_service::rollback(const wsrep::ws_handle& ws_handle, int ret= (trans_rollback_stmt(m_thd) || trans_rollback(m_thd)); m_thd->mdl_context.release_transactional_locks(); m_thd->mdl_context.release_explicit_locks(); + + free_root(m_thd->mem_root, MYF(MY_KEEP_PREALLOC)); + DBUG_RETURN(ret); } |