MariaDB
diff --git a/‎sql/handler.cc‎
Lines changed: 5 additions & 3 deletions b/‎sql/handler.cc‎
Lines changed: 5 additions & 3 deletions
@@ -1414,6 +1414,7 @@ int ha_commit_trans(THD *thd, bool all)
  goto err;
  }
 
+#if 1 // FIXME: This should be done in ha_prepare().
  if (rw_trans)
  {
  ulonglong trx_start_id= 0, trx_end_id= 0;
@@ -1438,12 +1439,13 @@ int ha_commit_trans(THD *thd, bool all)
  TR_table trt(thd, true);
  if (trt.update(trx_start_id, trx_end_id))
  goto err;
-#if 1 // FIXME: fix this properly, and remove TR_table::was_updated()
- if (all) // avoid a crash in versioning.rpl_stmt
+ // Here, the call will not commit inside InnoDB. It is only working
+ // around closing thd->transaction.stmt open by TR_table::open().
+ if (all)
  commit_one_phase_2(thd, false, &thd->transaction.stmt, false);
-#endif
  }
  }
+#endif
 
  if (trans->no_2pc || (rw_ha_count <= 1))
  {
Original file line number	Diff line number	Diff line change
`@@ -1414,6 +1414,7 @@ int ha_commit_trans(THD *thd, bool all)`
`1414`	`1414`	`goto err;`
`1415`	`1415`	`}`
`1416`	`1416`
	`1417`	`+#if 1 // FIXME: This should be done in ha_prepare().`
`1417`	`1418`	`if (rw_trans)`
`1418`	`1419`	`{`
`1419`	`1420`	`ulonglong trx_start_id= 0, trx_end_id= 0;`
`@@ -1438,12 +1439,13 @@ int ha_commit_trans(THD *thd, bool all)`
`1438`	`1439`	`TR_table trt(thd, true);`
`1439`	`1440`	`if (trt.update(trx_start_id, trx_end_id))`
`1440`	`1441`	`goto err;`
`1441`		`-#if 1 // FIXME: fix this properly, and remove TR_table::was_updated()`
`1442`		`- if (all) // avoid a crash in versioning.rpl_stmt`
	`1442`	`+ // Here, the call will not commit inside InnoDB. It is only working`
	`1443`	`+ // around closing thd->transaction.stmt open by TR_table::open().`
	`1444`	`+ if (all)`
`1443`	`1445`	`commit_one_phase_2(thd, false, &thd->transaction.stmt, false);`
`1444`		`-#endif`
`1445`	`1446`	`}`
`1446`	`1447`	`}`
	`1448`	`+#endif`
`1447`	`1449`
`1448`	`1450`	`if (trans->no_2pc \|\| (rw_ha_count <= 1))`
`1449`	`1451`	`{`