diff --git a/server/modules/include/blr.h b/server/modules/include/blr.h index 662a3d779..62cda59a3 100644 --- a/server/modules/include/blr.h +++ b/server/modules/include/blr.h @@ -158,7 +158,7 @@ typedef struct router_slave { #endif DCB *dcb; /*< The slave server DCB */ int state; /*< The state of this slave */ - int binlog_pos; /*< Binlog position for this slave */ + uint32_t binlog_pos; /*< Binlog position for this slave */ char binlogfile[BINLOG_FNAMELEN+1]; /*< Current binlog file for this slave */ char *uuid; /*< Slave UUID */ diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c index 37a348355..43226b201 100644 --- a/server/modules/routing/binlog/blr_slave.c +++ b/server/modules/routing/binlog/blr_slave.c @@ -1201,7 +1201,7 @@ uint32_t chksum; LOGIF(LD, (skygw_log_write( LOGFILE_DEBUG, "%s: COM_BINLOG_DUMP: binlog name '%s', length %d, " - "from position %d.", router->service->name, + "from position %lu.", router->service->name, slave->binlogfile, binlognamelen, slave->binlog_pos))); @@ -1529,7 +1529,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write( if (slave->stats.n_caughtup == 1) { LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, - "%s: Slave %s is up to date %s, %u.", + "%s: Slave %s is up to date %s, %lu.", router->service->name, slave->dcb->remote, slave->binlogfile, slave->binlog_pos))); @@ -1537,7 +1537,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write( else if ((slave->stats.n_caughtup % 50) == 0) { LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, - "%s: Slave %s is up to date %s, %u.", + "%s: Slave %s is up to date %s, %lu.", router->service->name, slave->dcb->remote, slave->binlogfile, slave->binlog_pos))); @@ -1561,7 +1561,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write( * we ignore these issues during the rotate processing. */ LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, - "Slave reached end of file for binlog file %s at %u " + "Slave reached end of file for binlog file %s at %lu " "which is not the file currently being downloaded. " "Master binlog is %s, %lu. This may be caused by a " "previous failure of the master.",