diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:23:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:23:47 +0200 |
| commit | a0d4f0f306c6e478a1f45727e8fd9c867f9672d9 (patch) | |
| tree | 88c88e6c3114afd9c111e1400563bbdddb80ff25 /sql/slave.cc | |
| parent | d388e7eb864a3ba677f832dff8353c55275a7942 (diff) | |
| parent | 84984b79f27399d015c43a51d2b1967838119d34 (diff) | |
| download | mariadb-git-a0d4f0f306c6e478a1f45727e8fd9c867f9672d9.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.35
commit 84984b79f27 is null-merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 0ecba3c42b8..749aad5d683 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7003,8 +7003,9 @@ dbug_gtid_accept: mi->using_gtid != Master_info::USE_GTID_NO && mi->events_queued_since_last_gtid > 0 && ( (mi->last_queued_gtid_standalone && - !Log_event::is_part_of_group((Log_event_type)(uchar) - buf[EVENT_TYPE_OFFSET])) || + (LOG_EVENT_IS_QUERY((Log_event_type)(uchar) + buf[EVENT_TYPE_OFFSET]) || + (uchar)buf[EVENT_TYPE_OFFSET] == INCIDENT_EVENT)) || (!mi->last_queued_gtid_standalone && ((uchar)buf[EVENT_TYPE_OFFSET] == XID_EVENT || ((uchar)buf[EVENT_TYPE_OFFSET] == QUERY_EVENT && /* QUERY_COMPRESSED_EVENT would never be commmit or rollback */ |