From b79407c5e9fd4f5e43feb9de05306a404f15905c Mon Sep 17 00:00:00 2001
From: Daniele Sciascia <daniele.sciascia@galeracluster.com>
Date: Fri, 21 Jul 2017 10:56:25 +0200
Subject: [PATCH] MW-388 Remove unnecessary conditions

---
 sql/sql_parse.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index b908c4dac7f..b09fa1e7b17 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5622,8 +5622,6 @@ finish:
       trans_rollback_stmt(thd);
 #ifdef WITH_WSREP
     else if (thd->spcont &&
-             !thd->is_error() &&
-             !thd->in_multi_stmt_transaction_mode() &&
              (thd->wsrep_conflict_state == MUST_ABORT ||
               thd->wsrep_conflict_state == CERT_FAILURE))
     {