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

Merge branch 'develop' into dev-mdb10

Browse Source
This commit is contained in:
Markus Makela
2015-06-22 19:27:34 +03:00
parent 2d9c9425c5 15e6d6f9fc
commit 71664f162b
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/modules/routing/binlog/blr_slave.c
View File

@ -1724,6 +1724,9 @@ uint32_t chksum;
binlognamelen = strlen(slave->binlogfile); binlognamelen = strlen(slave->binlogfile);
len = 19 + 8 + 4 + binlognamelen; len = 19 + 8 + 4 + binlognamelen;
/* no slave crc, remove 4 bytes */
if (slave->nocrc)
len -= 4;
// Build a fake rotate event // Build a fake rotate event
resp = gwbuf_alloc(len + 5); resp = gwbuf_alloc(len + 5);
@ -1742,17 +1745,19 @@ uint32_t chksum;
memcpy(ptr, slave->binlogfile, binlognamelen); memcpy(ptr, slave->binlogfile, binlognamelen);
ptr += binlognamelen; ptr += binlognamelen;
/* if (!slave->nocrc) {
* Now add the CRC to the fake binlog rotate event. /*
* * Now add the CRC to the fake binlog rotate event.
* The algorithm is first to compute the checksum of an empty buffer *
* and then the checksum of the event portion of the message, ie we do not * The algorithm is first to compute the checksum of an empty buffer
* include the length, sequence number and ok byte that makes up the first * and then the checksum of the event portion of the message, ie we do not
* 5 bytes of the message. We also do not include the 4 byte checksum itself. * include the length, sequence number and ok byte that makes up the first
*/ * 5 bytes of the message. We also do not include the 4 byte checksum itself.
chksum = crc32(0L, NULL, 0); */
chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4); chksum = crc32(0L, NULL, 0);
encode_value(ptr, chksum, 32); chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4);
encode_value(ptr, chksum, 32);
}
slave->dcb->func.write(slave->dcb, resp); slave->dcb->func.write(slave->dcb, resp);
return 1; return 1;