diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:10:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:10:21 +0300 |
commit | 429ca9a881689929b39a0cbfb7c3a62434f33837 (patch) | |
tree | f5786d7a815fcfc198e9d91b448788ecbd2c229f /sql/wsrep_hton.cc | |
parent | 4bf087986f7cdbb8164acbed77c644afda1d353b (diff) | |
parent | df24f8469d31cc7eb33b4446e1450b95c12e0122 (diff) | |
download | mariadb-git-429ca9a881689929b39a0cbfb7c3a62434f33837.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_hton.cc')
-rw-r--r-- | sql/wsrep_hton.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index ba11d94e6fa..b21ae10b371 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -538,6 +538,7 @@ wsrep_run_wsrep_commit(THD *thd, bool all) break; case WSREP_BF_ABORT: DBUG_ASSERT(thd->wsrep_trx_meta.gtid.seqno != WSREP_SEQNO_UNDEFINED); + /* fall through */ case WSREP_TRX_FAIL: WSREP_DEBUG("commit failed for reason: %d", rcode); DBUG_PRINT("wsrep", ("replicating commit fail")); |