diff options
author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:47:48 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 09:50:26 +0200 |
commit | 7970ac7fe87d1da34e3e212dccd57b112b94b3fe (patch) | |
tree | 4efda64ba55c4934469f61bda2013f92545dce1b /sql/slave.cc | |
parent | b03ab1270d24c1fe011aa50f9e6b495c6d508706 (diff) | |
parent | 23ddc3518f999e003d54f7a069b63b73585588aa (diff) | |
download | mariadb-git-7970ac7fe87d1da34e3e212dccd57b112b94b3fe.tar.gz |
Merge branch '10.4' into 10.5mariadb-10.5.16
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f75e867cc3b..c196312a150 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7094,8 +7094,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] == XA_PREPARE_LOG_EVENT || @@ -7129,33 +7130,8 @@ dbug_gtid_accept: mi->gtid_current_pos.update(&mi->last_queued_gtid); mi->events_queued_since_last_gtid= 0; - if (unlikely(gtid_skip_enqueue)) - { - error= ER_SLAVE_RELAY_LOG_WRITE_FAILURE; - sql_print_error("Recieved a group closing %s event " - "at %llu position in the group while there are " - "still %llu events to skip upon reconnecting; " - "the last seen GTID is %u-%u-%llu", - Log_event::get_type_str((Log_event_type) (uchar) - buf[EVENT_TYPE_OFFSET]), - (mi->events_queued_since_last_gtid - - mi->gtid_reconnect_event_skip_count), - mi->events_queued_since_last_gtid, - mi->last_queued_gtid); - goto err; - } - else - { - /* - The whole of the current event group is queued. So in case of - reconnect we can start from after the current GTID. - */ - mi->gtid_current_pos.update(&mi->last_queued_gtid); - mi->events_queued_since_last_gtid= 0; - - /* Reset the domain_id_filter flag. */ - mi->domain_id_filter.reset_filter(); - } + /* Reset the domain_id_filter flag. */ + mi->domain_id_filter.reset_filter(); } skip_relay_logging: |