Cleaned up the code based on the code review

Added missing error condition checks and cleaned up code.
This commit is contained in:
Markus Makela
2016-02-15 16:41:45 +02:00
parent a55f017c75
commit cd2af6ffef
3 changed files with 55 additions and 59 deletions

View File

@ -2078,17 +2078,18 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
hkheartbeat - beat1);
}
blr_send_event(slave, &hdr, (uint8_t*) record->start);
if (blr_send_event(slave, &hdr, (uint8_t*) record->start))
{
if (hdr.event_type != ROTATE_EVENT)
{
slave->binlog_pos = hdr.next_pos;
}
slave->stats.n_events++;
burst_size -= hdr.event_size;
}
gwbuf_free(record);
record = NULL;
if (hdr.event_type != ROTATE_EVENT)
{
slave->binlog_pos = hdr.next_pos;
}
slave->stats.n_events++;
burst_size -= hdr.event_size;
/* set lastReply for slave heartbeat check */
if (router->send_slave_heartbeat)
slave->lastReply = time(0);