diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-13 12:30:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-13 12:37:08 +0300 |
| commit | eff898f2a0d9888815ec3fb7e7aae93b319f6796 (patch) | |
| tree | 6a4c7491edc5647c1bc7f3b53ae99f389b54ecfd | |
| parent | 15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9 (diff) | |
| download | mariadb-git-eff898f2a0d9888815ec3fb7e7aae93b319f6796.tar.gz | |
MDEV-20335: Extra trans_commit_stmt after rollback caused by incorrect fix of MDEV-14401
Fix incorrect else that should have been else if.
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |