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.
This commit is contained in:
MassimilianoPinto
2017-10-26 11:32:06 +02:00
parent 9d35c705f3
commit f805716700

View File

@ -62,8 +62,7 @@
* 11/07/2016 Massimiliano Pinto Added SSL backend support * 11/07/2016 Massimiliano Pinto Added SSL backend support
* 24/08/2016 Massimiliano Pinto Added slave notification via CS_WAIT_DATA * 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: * 16/09/2016 Massimiliano Pinto Special events created by MaxScale are not sent to slaves:
* MARIADB10_START_ENCRYPTION_EVENT or IGNORABLE_EVENT * MARIADB10_START_ENCRYPTION_EVENT or IGNORABLE_EVENT.
* Events with LOG_EVENT_IGNORABLE_F are skipped as well.
* *
* @endverbatim * @endverbatim
*/ */
@ -2384,8 +2383,7 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
/* Don't sent special events generated by MaxScale */ /* Don't sent special events generated by MaxScale */
if (hdr.event_type == MARIADB10_START_ENCRYPTION_EVENT || if (hdr.event_type == MARIADB10_START_ENCRYPTION_EVENT ||
hdr.event_type == IGNORABLE_EVENT || hdr.event_type == IGNORABLE_EVENT)
(hdr.flags & LOG_EVENT_IGNORABLE_F))
{ {
/* In case of file rotation or pos = 4 the events are sent from position 4. /* In case of file rotation or pos = 4 the events are sent from position 4.
* new FDE at pos 4 is read. * new FDE at pos 4 is read.