From f805716700800066d21542bbcaf5dcc7f9e53edc Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Thu, 26 Oct 2017 11:32:06 +0200 Subject: [PATCH] MXS-1497: Don't skip events with LOG_EVENT_IGNORABLE_F flag Currently binlog server doesn't send to slaves these event types: - MARIADB10_START_ENCRYPTION_EVENT - IGNORABLE_EVENT It also skips events with LOG_EVENT_IGNORABLE_F flag. This modification allows sending events with that flag. --- server/modules/routing/binlogrouter/blr_slave.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/modules/routing/binlogrouter/blr_slave.c b/server/modules/routing/binlogrouter/blr_slave.c index f1f6eefe5..1eb6571bc 100644 --- a/server/modules/routing/binlogrouter/blr_slave.c +++ b/server/modules/routing/binlogrouter/blr_slave.c @@ -62,8 +62,7 @@ * 11/07/2016 Massimiliano Pinto Added SSL backend support * 24/08/2016 Massimiliano Pinto Added slave notification via CS_WAIT_DATA * 16/09/2016 Massimiliano Pinto Special events created by MaxScale are not sent to slaves: - * MARIADB10_START_ENCRYPTION_EVENT or IGNORABLE_EVENT - * Events with LOG_EVENT_IGNORABLE_F are skipped as well. + * MARIADB10_START_ENCRYPTION_EVENT or IGNORABLE_EVENT. * * @endverbatim */ @@ -2384,8 +2383,7 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large) /* Don't sent special events generated by MaxScale */ if (hdr.event_type == MARIADB10_START_ENCRYPTION_EVENT || - hdr.event_type == IGNORABLE_EVENT || - (hdr.flags & LOG_EVENT_IGNORABLE_F)) + hdr.event_type == IGNORABLE_EVENT) { /* In case of file rotation or pos = 4 the events are sent from position 4. * new FDE at pos 4 is read.