diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 15:38:03 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 15:38:03 +0200 |
| commit | d6d54584ee813c6592cecb01eab3d896ed1475a8 (patch) | |
| tree | 84bcff9bd186b0d8b3943efcfbacd0e0de4e8d3d /sql | |
| parent | e8e2ef470c542d4e8776809de72a1afaee991a7f (diff) | |
| parent | 5ca061e65f4f54863f2ca416d97a0f6f9ede940b (diff) | |
| download | mariadb-git-d6d54584ee813c6592cecb01eab3d896ed1475a8.tar.gz | |
Merge fix of embedded server build.
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 6d0b20e29ee..868a1475a7f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1582,6 +1582,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) { /* @@ -1599,6 +1600,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) { |