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

Fix annotate_rows and binlog name processing

Browse Source 
The four extra bytes added by the binlog checksums weren't ignored. This
caused the info messages to display the binary data of the checksum.
This commit is contained in:
Markus Mäkelä 2018-06-07 21:23:54 +03:00
parent 7c18696608
commit 47d84cab81
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/avrorouter/avro_file.cc
View File

@ -614,7 +614,7 @@ avro_binlog_end_t avro_read_all_events(Avro *router)
{
int len = hdr.event_size - BINLOG_EVENT_HDR_LEN - 8;
if (found_chksum)
if (found_chksum || router->binlog_checksum)
{
len -= 4;
}
@ -634,7 +634,8 @@ avro_binlog_end_t avro_read_all_events(Avro *router)
else if (hdr.event_type == MARIADB_ANNOTATE_ROWS_EVENT)
{
// This appears to need special handling
MXS_INFO("Annotate_rows_event: %.*s", hdr.event_size - BINLOG_EVENT_HDR_LEN, ptr);
int annotate_len = hdr.event_size - BINLOG_EVENT_HDR_LEN - (found_chksum || router->binlog_checksum ? 4 : 0);
MXS_INFO("Annotate_rows_event: %.*s", annotate_len, ptr);
pos += hdr.event_size;
router->current_pos = pos;
gwbuf_free(result);