hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for ANNOTATE_ROWS_EVENT in COM_BINLOG_DUMP

Browse Source 
Now registration with MariaDB server supports ANNOTATE_ROWS_EVENT.
Request flag is in COM_BINLOG_DUMP packet
This commit is contained in:
MassimilianoPinto
2016-09-01 17:44:41 +02:00
parent 099263709e
commit 4e1cb56710
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/include/blr.h
View File

@ -33,6 +33,7 @@
* 26/04/16 Massimiliano Pinto Added MariaDB 10.0 and 10.1 GTID event flags detection * 26/04/16 Massimiliano Pinto Added MariaDB 10.0 and 10.1 GTID event flags detection
* 11/07/16 Massimiliano Pinto Added SSL backend support * 11/07/16 Massimiliano Pinto Added SSL backend support
* 22/07/16 Massimiliano Pinto Added Semi-Sync replication support * 22/07/16 Massimiliano Pinto Added Semi-Sync replication support
* 01/08/2016 Massimiliano Pinto Added support for ANNOTATE_ROWS_EVENT in COM_BINLOG_DUMP
* *
* @endverbatim * @endverbatim
*/ */
@ -122,6 +123,11 @@
#define LOG_EVENT_NO_FILTER_F 0x0100 #define LOG_EVENT_NO_FILTER_F 0x0100
#define LOG_EVENT_MTS_ISOLATE_F 0x0200 #define LOG_EVENT_MTS_ISOLATE_F 0x0200
/**
* Binlog COM_BINLOG_DUMP flags
*/
#define BLR_REQUEST_ANNOTATE_ROWS_EVENT 2
/** /**
* How often to call the binlog status function (seconds) * How often to call the binlog status function (seconds)
*/ */

13
server/modules/routing/binlog/blr_master.c
View File

@ -48,6 +48,7 @@
* 23/10/2015 Markus Makela Added current_safe_event * 23/10/2015 Markus Makela Added current_safe_event
* 26/04/2016 Massimiliano Pinto Added MariaDB 10.0 and 10.1 GTID event flags detection * 26/04/2016 Massimiliano Pinto Added MariaDB 10.0 and 10.1 GTID event flags detection
* 22/07/2016 Massimiliano Pinto Added semi_sync replication support * 22/07/2016 Massimiliano Pinto Added semi_sync replication support
* 01/08/2016 Massimiliano Pinto Added support for ANNOTATE_ROWS_EVENT in COM_BINLOG_DUMP
* *
* @endverbatim * @endverbatim
*/ */
@ -949,7 +950,17 @@ blr_make_binlog_dump(ROUTER_INSTANCE *router)
data[4] = COM_BINLOG_DUMP; // Command data[4] = COM_BINLOG_DUMP; // Command
encode_value(&data[5], encode_value(&data[5],
router->current_pos, 32); // binlog position router->current_pos, 32); // binlog position
encode_value(&data[9], 0, 16); // Flags
/* With mariadb10 always ask for annotate rows events */
if (router->mariadb10_compat)
{
// set flag for annotate rows event
encode_value(&data[9], BLR_REQUEST_ANNOTATE_ROWS_EVENT, 16);
}
else
encode_value(&data[9], 0, 16); // No flag set
}
encode_value(&data[11], encode_value(&data[11],
router->serverid, 32); // Server-id of MaxScale router->serverid, 32); // Server-id of MaxScale
memcpy((char *)&data[15], router->binlog_name, memcpy((char *)&data[15], router->binlog_name,