diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 15:47:30 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 15:47:30 +0200 |
| commit | afd59b575a75ebbc57f71ce2865fdff85e3e233b (patch) | |
| tree | 68813c0d7b4e90aed1b99d983863365f92205df7 /sql | |
| parent | dbd205797b7ee4373972d9d2014bf24e5a01b094 (diff) | |
| parent | 5ca061e65f4f54863f2ca416d97a0f6f9ede940b (diff) | |
| download | mariadb-git-afd59b575a75ebbc57f71ce2865fdff85e3e233b.tar.gz | |
Merge branch 'mdev8302-3' into 10.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 4f070d3336b..1ddb2063faa 100644 --- 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) { |