VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-27 09:34:23 +03:00
parent 97a4a3872e 571764c04f
commit bb284e3fdb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/wsrep_high_priority_service.cc
View File

@ -317,9 +317,15 @@ int Wsrep_high_priority_service::commit(const wsrep::ws_handle& ws_handle,
DBUG_ASSERT(thd->wsrep_trx().active());
thd->wsrep_cs().prepare_for_ordering(ws_handle, ws_meta, true);
thd_proc_info(thd, "committing");
int ret=0;
const bool is_ordered= !ws_meta.seqno().is_undefined();
int ret= trans_commit(thd);
if (!thd->transaction->stmt.is_empty())
ret= trans_commit_stmt(thd);
if (ret == 0)
ret= trans_commit(thd);
if (ret == 0)
{