diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:25:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:25:30 +0200 |
| commit | 23ddc3518f999e003d54f7a069b63b73585588aa (patch) | |
| tree | 2480b1ff4db3b8b2efae50bd9be0538393729894 /sql/slave.cc | |
| parent | 4dffa7b5c5baadf95e01d7d595b4ae0dab5965cf (diff) | |
| parent | a0d4f0f306c6e478a1f45727e8fd9c867f9672d9 (diff) | |
| download | mariadb-git-23ddc3518f999e003d54f7a069b63b73585588aa.tar.gz | |
Merge branch '10.3' into 10.4mariadb-10.4.25
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 d0bc7e474df..34324a3f2a2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7045,8 +7045,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 */ |