database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch 'mdev8302-3' into 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-08-04 15:47:30 +02:00
parent dbd205797b 5ca061e65f
commit afd59b575a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -1615,6 +1615,7 @@ int ha_rollback_trans(THD *thd, bool all)
DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL || DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL ||
trans == &thd->transaction.stmt); trans == &thd->transaction.stmt);
#ifdef HAVE_REPLICATION
if (is_real_trans) 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) if (thd->rgi_slave && thd->rgi_slave->did_mark_start_commit)
thd->rgi_slave->unmark_start_commit(); thd->rgi_slave->unmark_start_commit();
} }
#endif
if (thd->in_sub_stmt) if (thd->in_sub_stmt)
{ {