Merge remote-tracking branch 'origin/MW-388' into MW-388-5.7

sciascid · sciascid · commit e251c35ef964 · 2017-07-21T10:59:30.000+02:00
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -5580,8 +5580,6 @@ case SQLCOM_PREPARE:
       trans_rollback_stmt(thd);
 #ifdef WITH_WSREP
     else if (thd->sp_runtime_ctx &&
-             !thd->is_error() &&
-             !thd->in_multi_stmt_transaction_mode() &&
              (thd->wsrep_conflict_state == MUST_ABORT ||
               thd->wsrep_conflict_state == CERT_FAILURE))
     {

Original file line number	Diff line number	Diff line change
`@@ -5580,8 +5580,6 @@ case SQLCOM_PREPARE:`
`5580`	`5580`	`trans_rollback_stmt(thd);`
`5581`	`5581`	`#ifdef WITH_WSREP`
`5582`	`5582`	`else if (thd->sp_runtime_ctx &&`
`5583`		`- !thd->is_error() &&`
`5584`		`- !thd->in_multi_stmt_transaction_mode() &&`
`5585`	`5583`	`(thd->wsrep_conflict_state == MUST_ABORT \|\|`
`5586`	`5584`	`thd->wsrep_conflict_state == CERT_FAILURE))`
`5587`	`5585`	`{`