Merge branch 'mdev8302-3' into 10.1

knielsen · knielsen · commit afd59b575a75 · 2015-08-04T15:47:30.000+02:00
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)
   {

Original file line number	Diff line number	Diff line change
`@@ -1615,6 +1615,7 @@ int ha_rollback_trans(THD *thd, bool all)`
`1615`	`1615`	`DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL \|\|`
`1616`	`1616`	`trans == &thd->transaction.stmt);`
`1617`	`1617`
	`1618`	`+#ifdef HAVE_REPLICATION`
`1618`	`1619`	`if (is_real_trans)`
`1619`	`1620`	`{`
`1620`	`1621`	`/*`
`@@ -1632,6 +1633,7 @@ int ha_rollback_trans(THD *thd, bool all)`
`1632`	`1633`	`if (thd->rgi_slave && thd->rgi_slave->did_mark_start_commit)`
`1633`	`1634`	`thd->rgi_slave->unmark_start_commit();`
`1634`	`1635`	`}`
	`1636`	`+#endif`
`1635`	`1637`
`1636`	`1638`	`if (thd->in_sub_stmt)`
`1637`	`1639`	`{`