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

MXS-1545: Fix remaining compile issues

Browse Source
This commit is contained in:
Esa Korhonen
2017-11-27 16:22:46 +02:00
parent 520ee35bd2
commit 8966f36b1d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlogrouter/blr_file.c
View File

@ -4508,7 +4508,7 @@ bool blr_binlog_file_exists(ROUTER_INSTANCE *router,
// No file found // No file found
MXS_WARNING("%s: %s, missing binlog file '%s'", MXS_WARNING("%s: %s, missing binlog file '%s'",
router->service->name, router->service->name,
log_file == NULL ? info_file == NULL ?
"ROTATE_EVENT" : "ROTATE_EVENT" :
"Slave request", "Slave request",
path); path);

1
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -2096,6 +2096,7 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue
GWBUF *fde = blr_slave_read_fde(router, slave); GWBUF *fde = blr_slave_read_fde(router, slave);
if (fde == NULL) if (fde == NULL)
{ {
char errmsg[BINLOG_ERROR_MSG_LEN + 1];
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, snprintf(errmsg, BINLOG_ERROR_MSG_LEN,
"Cannot read FDE event from file '%s'", "Cannot read FDE event from file '%s'",
slave->binlogfile); slave->binlogfile);