Merge branch 'mdev8302-3' into 10.1

afd59b57 · Kristian Nielsen · dbd20579 · 5ca061e6 · afd59b57
Commit afd59b57 authored Aug 04, 2015 by Kristian Nielsen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

No files found.
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1615,6 +1615,7 @@ int ha_rollback_trans(THD *thd, bool all)
  DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL ||
              trans == &thd->transaction.stmt);

+#ifdef HAVE_REPLICATION
  if (is_real_trans)
  {
    /*
@@ -1632,6 +1633,7 @@ int ha_rollback_trans(THD *thd, bool all)
    if (thd->rgi_slave && thd->rgi_slave->did_mark_start_commit)
      thd->rgi_slave->unmark_start_commit();
  }
+#endif

  if (thd->in_sub_stmt)
  {