diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-08-26 14:05:33 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-08-26 14:05:33 +0300 |
| commit | b3e381708f87e05b525ed393054d3253d5440fda (patch) | |
| tree | 3f2fdb4e39711018d4f440f9456928bbd2c21e1f /sql/sql_repl.cc | |
| parent | 21286d88d69952e75b46f9c67dc5297377ec53c3 (diff) | |
| download | mariadb-git-MDEV-742-xa_repl.tar.gz | |
MDEV-742 (intermediate commit)MDEV-742-xa_repl
typ == XID_EVENT || typ == XA_PREPARE_LOG_EVENT augmentation.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index a058c366f60..3ea9a2b52e1 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1640,7 +1640,7 @@ is_until_reached(binlog_send_info *info, ulong *ev_offset, return false; break; case GTID_UNTIL_STOP_AFTER_TRANSACTION: - if (event_type != XID_EVENT && + if (event_type != XID_EVENT && event_type != XA_PREPARE_LOG_EVENT && (event_type != QUERY_EVENT || /* QUERY_COMPRESSED_EVENT would never be commmit or rollback */ !Query_log_event::peek_is_commit_rollback (info->packet->ptr()+*ev_offset, @@ -1875,7 +1875,7 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, info->gtid_skip_group= GTID_SKIP_NOT; return NULL; case GTID_SKIP_TRANSACTION: - if (event_type == XID_EVENT || + if (event_type == XID_EVENT || event_type == XA_PREPARE_LOG_EVENT || (event_type == QUERY_EVENT && /* QUERY_COMPRESSED_EVENT would never be commmit or rollback */ Query_log_event::peek_is_commit_rollback(packet->ptr() + ev_offset, len - ev_offset, |