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/rpl_parallel.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/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index dc5e3ff1fbf..91cf0428611 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -648,7 +648,7 @@ convert_kill_to_deadlock_error(rpl_group_info *rgi) static int is_group_ending(Log_event *ev, Log_event_type event_type) { - if (event_type == XID_EVENT) + if (event_type == XID_EVENT || event_type == XA_PREPARE_LOG_EVENT) return 1; if (event_type == QUERY_EVENT) // COMMIT/ROLLBACK are never compressed { @@ -2615,7 +2615,7 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev, else { DBUG_ASSERT(rli->gtid_skip_flag == GTID_SKIP_TRANSACTION); - if (typ == XID_EVENT || + if (typ == XID_EVENT || typ == XA_PREPARE_LOG_EVENT || (typ == QUERY_EVENT && // COMMIT/ROLLBACK are never compressed (((Query_log_event *)ev)->is_commit() || ((Query_log_event *)ev)->is_rollback()))) |