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

Binlog Router, slave binlog_pos is now uint32

Browse Source 
Binlog Router, slave binlog_pos is now uint32
This commit is contained in:
MassimilianoPinto
2015-04-02 16:52:48 +02:00
parent 56afee9f84
commit 5ce1b742e9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/include/blr.h
View File

@ -158,7 +158,7 @@ typedef struct router_slave {
#endif #endif
DCB *dcb; /*< The slave server DCB */ DCB *dcb; /*< The slave server DCB */
int state; /*< The state of this slave */ 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]; char binlogfile[BINLOG_FNAMELEN+1];
/*< Current binlog file for this slave */ /*< Current binlog file for this slave */
char *uuid; /*< Slave UUID */ char *uuid; /*< Slave UUID */

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

@ -1201,7 +1201,7 @@ uint32_t chksum;
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,
"%s: COM_BINLOG_DUMP: binlog name '%s', length %d, " "%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->binlogfile, binlognamelen,
slave->binlog_pos))); slave->binlog_pos)));
@ -1529,7 +1529,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
if (slave->stats.n_caughtup == 1) if (slave->stats.n_caughtup == 1)
{ {
LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, 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, router->service->name,
slave->dcb->remote, slave->dcb->remote,
slave->binlogfile, slave->binlog_pos))); 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) else if ((slave->stats.n_caughtup % 50) == 0)
{ {
LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, 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, router->service->name,
slave->dcb->remote, slave->dcb->remote,
slave->binlogfile, slave->binlog_pos))); 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. * we ignore these issues during the rotate processing.
*/ */
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, 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. " "which is not the file currently being downloaded. "
"Master binlog is %s, %lu. This may be caused by a " "Master binlog is %s, %lu. This may be caused by a "
"previous failure of the master.", "previous failure of the master.",