From eff898f2a0d9888815ec3fb7e7aae93b319f6796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 13 Aug 2019 12:30:36 +0300 Subject: [PATCH] MDEV-20335: Extra trans_commit_stmt after rollback caused by incorrect fix of MDEV-14401 Fix incorrect else that should have been else if. --- sql/sql_parse.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 385319d80ad..adead650029 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5487,7 +5487,7 @@ finish: if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR)) trans_rollback_stmt(thd); #ifdef WITH_WSREP - if (thd->spcont && + else if (thd->spcont && (thd->wsrep_conflict_state == MUST_ABORT || thd->wsrep_conflict_state == ABORTED || thd->wsrep_conflict_state == CERT_FAILURE))