Merge branch 'blr' into develop

2015-02-09 20:58:55 +00:00
parent 7e077a1dce b58e09cdb7
commit faca6b6d76
4 changed files with 27 additions and 1 deletions
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@ -1385,6 +1385,7 @@ uint8_t		*ptr;
 		*ptr++ = slave->seqno++;
 		*ptr++ = 0;		// OK
 		head = gwbuf_append(head, record);
+		slave->lastEventTimestamp = hdr.timestamp;
 		if (hdr.event_type == ROTATE_EVENT)
 		{
 unsigned long beat1 = hkheartbeat;