diff options
| author | Alexey Yurchenko <alexey.yurchenko@galeracluster.com> | 2019-08-28 07:19:24 +0100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-28 09:19:24 +0300 |
| commit | 41fa564c88dc86a046d9e0b0a7c0bf4df2944492 (patch) | |
| tree | 91713626d72907c4af2f64e63e5c687177a28935 /sql/wsrep_binlog.cc | |
| parent | 53ee9c6cf9ecc7064222a24746cb5e6da3fc1402 (diff) | |
| download | mariadb-git-41fa564c88dc86a046d9e0b0a7c0bf4df2944492.tar.gz | |
MDEV-17048 Inconsistency voting support (#1373)
* Collect and pass apply error data to provider
* Rollback failed transaction and continue operation if provider returns
SUCCESS
* MTR tests for inconsistency voting
Diffstat (limited to 'sql/wsrep_binlog.cc')
| -rw-r--r-- | sql/wsrep_binlog.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc index ecab4664d7b..cfa709b1055 100644 --- a/sql/wsrep_binlog.cc +++ b/sql/wsrep_binlog.cc @@ -417,7 +417,9 @@ void wsrep_register_for_group_commit(THD *thd) void wsrep_unregister_from_group_commit(THD *thd) { - DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_ordered_commit); + DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_ordered_commit|| + // ordered_commit() failure results in s_aborting state + thd->wsrep_trx().state() == wsrep::transaction::s_aborting); wait_for_commit *wfc= thd->wait_for_commit_ptr; if (wfc) |