diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-05-19 13:57:48 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-05-19 13:57:48 +0300 |
| commit | 1c832e54e4536ece972f7705f0cf3cf4e47cb19e (patch) | |
| tree | 2d0f49904a43bae5a54c222b095651dc491adacf | |
| parent | acd996be8a2f4590196f3d4267dbc27d4a9d77ea (diff) | |
| download | mariadb-git-1c832e54e4536ece972f7705f0cf3cf4e47cb19e.tar.gz | |
MDEV-7974: more to STANDLONE groupping: recovery and io thread retransmit rel.
| -rw-r--r-- | sql/log.cc | 1 | ||||
| -rw-r--r-- | sql/slave.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 84dba2a41f2..fa322bce200 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -10335,6 +10335,7 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name, ((last_gtid_standalone && !ev->is_part_of_group(typ)) || (!last_gtid_standalone && (typ == XID_EVENT || + typ == XA_PREPARE_LOG_EVENT || (LOG_EVENT_IS_QUERY(typ) && (((Query_log_event *)ev)->is_commit() || ((Query_log_event *)ev)->is_rollback())))))) diff --git a/sql/slave.cc b/sql/slave.cc index af2d05910fe..a4f0b512904 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7039,6 +7039,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) buf[EVENT_TYPE_OFFSET])) || (!mi->last_queued_gtid_standalone && ((uchar)buf[EVENT_TYPE_OFFSET] == XID_EVENT || + (uchar)buf[EVENT_TYPE_OFFSET] == XA_PREPARE_LOG_EVENT || ((uchar)buf[EVENT_TYPE_OFFSET] == QUERY_EVENT && /* QUERY_COMPRESSED_EVENT would never be commmit or rollback */ Query_log_event::peek_is_commit_rollback(buf, event_len, checksum_alg)))))) |