Merge branch 'mdev8302-3' into 10.1

MariaDB · Aug 4, 2015 · afd59b5 · afd59b5
2 parents dbd2057 + 5ca061e
commit afd59b5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)
   {