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

Merge part of MXS-289 bug

Browse Source 
Merge part of MXS-289 bug
This commit is contained in:
MassimilianoPinto
2015-07-27 18:44:05 +02:00
parent f22e2ec87b
commit 8d7def654a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,7 +724,7 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"%s: Master %s disconnected after %ld seconds. " "%s: Master %s disconnected after %ld seconds. "
"%d events read,", "%d events read,",
router->service->name, router->master->remote, router->service->name, router->service->dbref->server->name,
time(0) - router->connect_time, router->stats.n_binlogs_ses))); time(0) - router->connect_time, router->stats.n_binlogs_ses)));
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,

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

@ -619,8 +619,7 @@ char query[128];
"%s: Request binlog records from %s at " "%s: Request binlog records from %s at "
"position %lu from master server %s:%d", "position %lu from master server %s:%d",
router->service->name, router->binlog_name, router->service->name, router->binlog_name,
router->binlog_position, router->master->remote, router->binlog_position, router->service->dbref->server->name)));
router->service->dbref->server->port)));
break; break;
case BLRM_BINLOGDUMP: case BLRM_BINLOGDUMP:
// Main body, we have received a binlog record from the master // Main body, we have received a binlog record from the master