diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
| commit | 1b3c15f1995531a1263139fe1bdde570f1b93b19 (patch) | |
| tree | f4bc1013d3b67a3b971f66b553ce0e1728529cc8 /sql/rpl_rli.cc | |
| parent | c73718d917e903bddf7059cd8a515066f04311d1 (diff) | |
| parent | 313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe (diff) | |
| download | mariadb-git-1b3c15f1995531a1263139fe1bdde570f1b93b19.tar.gz | |
merge with 10.0-monty
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index ac93f9640e8..c5c59f3aebb 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1583,6 +1583,7 @@ void rpl_group_info::cleanup_context(THD *thd, bool error) if (error) { trans_rollback_stmt(thd); // if a "statement transaction" + /* trans_rollback() also resets OPTION_GTID_BEGIN */ trans_rollback(thd); // if a "real transaction" } m_table_map.clear_tables(); |