Commit eff898f2 authored by Jan Lindström's avatar Jan Lindström

MDEV-20335: Extra trans_commit_stmt after rollback caused by incorrect fix of MDEV-14401

Fix incorrect else that should have been else if.
parent 15c1ab52
......@@ -5487,7 +5487,7 @@ mysql_execute_command(THD *thd)
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))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment