Merge 10.1 into 10.2

ed4ccf34 · Marko Mäkelä · f13471c9 · c738aa24 · ed4ccf34
Commit ed4ccf34 authored Aug 13, 2019 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6018,7 +6018,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))