diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
| commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
| tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /sql/rpl_rli.cc | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
| download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz | |
Automatic merge
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(); |