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

Added casts to unsigned long to some log messages.

Browse Source
This commit is contained in:
Markus Makela
2015-04-08 10:54:42 +03:00
parent bd68121cc0
commit d490c2c509
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,7 +1356,7 @@ int action;
"Slave %d is ahead of expected position %s@%d. " "Slave %d is ahead of expected position %s@%d. "
"Expected position %d", "Expected position %d",
slave->serverid, slave->binlogfile, slave->serverid, slave->binlogfile,
slave->binlog_pos, (unsigned long)slave->binlog_pos,
hdr->next_pos - hdr->event_size))); hdr->next_pos - hdr->event_size)));
spinlock_acquire(&slave->catch_lock); spinlock_acquire(&slave->catch_lock);
slave->cstate &= ~(CS_UPTODATE|CS_BUSY); slave->cstate &= ~(CS_UPTODATE|CS_BUSY);

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

@ -1203,7 +1203,7 @@ uint32_t chksum;
"%s: COM_BINLOG_DUMP: binlog name '%s', length %d, " "%s: COM_BINLOG_DUMP: binlog name '%s', length %d, "
"from position %lu.", router->service->name, "from position %lu.", router->service->name,
slave->binlogfile, binlognamelen, slave->binlogfile, binlognamelen,
slave->binlog_pos))); (unsigned long)slave->binlog_pos)));
slave->seqno = 1; slave->seqno = 1;
@ -1261,7 +1261,7 @@ uint32_t chksum;
"%s: New slave %s, server id %d, requested binlog file %s from position %lu", "%s: New slave %s, server id %d, requested binlog file %s from position %lu",
router->service->name, slave->dcb->remote, router->service->name, slave->dcb->remote,
slave->serverid, slave->serverid,
slave->binlogfile, slave->binlog_pos))); slave->binlogfile, (unsigned long)slave->binlog_pos)));
if (slave->binlog_pos != router->binlog_position || if (slave->binlog_pos != router->binlog_position ||
strcmp(slave->binlogfile, router->binlog_name) != 0) strcmp(slave->binlogfile, router->binlog_name) != 0)
@ -1532,7 +1532,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
"%s: Slave %s is up to date %s, %lu.", "%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, (unsigned long)slave->binlog_pos)));
} }
else if ((slave->stats.n_caughtup % 50) == 0) else if ((slave->stats.n_caughtup % 50) == 0)
{ {
@ -1540,7 +1540,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
"%s: Slave %s is up to date %s, %lu.", "%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, (unsigned long)slave->binlog_pos)));
} }
} }
} }
@ -1565,7 +1565,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
"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.",
slave->binlogfile, slave->binlog_pos, slave->binlogfile, (unsigned long)slave->binlog_pos,
router->binlog_name, router->binlog_position))); router->binlog_name, router->binlog_position)));
if (blr_slave_fake_rotate(router, slave)) if (blr_slave_fake_rotate(router, slave))
{ {