diff options
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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); } |