MW-388 Remove unnecessary conditions

b79407c5 · Daniele Sciascia · Jan Lindström · 958ad5a8 · b79407c5
Commit b79407c5 authored Jul 21, 2017 by Daniele Sciascia Committed by Jan Lindström Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +0 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5622,8 +5622,6 @@ case SQLCOM_PREPARE:
      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))
    {