From 8d7def654a72022627db23a1e59d785cdd455875 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Mon, 27 Jul 2015 18:44:05 +0200 Subject: [PATCH] Merge part of MXS-289 bug Merge part of MXS-289 bug --- server/modules/routing/binlog/blr.c | 2 +- server/modules/routing/binlog/blr_master.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c index 2aa45afa9..5f53f2ad8 100644 --- a/server/modules/routing/binlog/blr.c +++ b/server/modules/routing/binlog/blr.c @@ -724,7 +724,7 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session; LOGFILE_MESSAGE, "%s: Master %s disconnected after %ld seconds. " "%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))); LOGIF(LE, (skygw_log_write_flush( LOGFILE_ERROR, diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c index 5aeaf2f99..14e89eaad 100644 --- a/server/modules/routing/binlog/blr_master.c +++ b/server/modules/routing/binlog/blr_master.c @@ -619,8 +619,7 @@ char query[128]; "%s: Request binlog records from %s at " "position %lu from master server %s:%d", router->service->name, router->binlog_name, - router->binlog_position, router->master->remote, - router->service->dbref->server->port))); + router->binlog_position, router->service->dbref->server->name))); break; case BLRM_BINLOGDUMP: // Main body, we have received a binlog record from the master