From 7ba2916c552638e3f8ab4cf2945bbfe99f745dd4 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 27 Feb 2015 21:42:03 +0100
Subject: MDEV-7000 Assertion `0' failed in Protocol::end_statement() on
 executing DDL under innodb_fake_changes=1

correct the if() condition to match the behavior of the old code
that this if() was supposed to replace
---
 sql/handler.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index 41e686003c5..7c70babfea8 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1152,9 +1152,8 @@ static int prepare_or_error(handlerton *ht, THD *thd, bool all)
   {
     /* avoid sending error, if we're going to replay the transaction */
 #ifdef WITH_WSREP
-    if (ht == wsrep_hton &&
-        err != EMSGSIZE &&
-        thd->wsrep_conflict_state != MUST_REPLAY)
+    if (ht != wsrep_hton ||
+        err == EMSGSIZE || thd->wsrep_conflict_state != MUST_REPLAY)
 #endif
       my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
   }
-- 
cgit v1.2.1