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

Addition of checksum handling in COM_BINLOG_DUMP

Browse Source
This commit is contained in:
Mark Riddoch
2015-02-05 09:15:45 +00:00
parent 07536611d3
commit b9f36d6489
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/binlog/blr_file.c
View File

@ -354,6 +354,10 @@ int n;
unsigned long filelen = 0; unsigned long filelen = 0;
struct stat statb; struct stat statb;
if (!file)
{
return NULL;
}
if (fstat(file->fd, &statb) == 0) if (fstat(file->fd, &statb) == 0)
filelen = statb.st_size; filelen = statb.st_size;
if (pos >= filelen) if (pos >= filelen)

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

@ -1079,6 +1079,8 @@ uint32_t chksum;
ptr = GWBUF_DATA(queue); ptr = GWBUF_DATA(queue);
len = extract_field(ptr, 24); len = extract_field(ptr, 24);
binlognamelen = len - 11; binlognamelen = len - 11;
if (! slave->nocrc)
binlognamelen -= 4;
ptr += 4; // Skip length and sequence number ptr += 4; // Skip length and sequence number
if (*ptr++ != COM_BINLOG_DUMP) if (*ptr++ != COM_BINLOG_DUMP)
{ {