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

MXS-1546: revert commit e16eee0cc3c6307f732c2e43d995d3c86cdd67a7

Browse Source 
MXS-1546: revert commit e16eee0cc3c6307f732c2e43d995d3c86cdd67a7

This code is not necessary in MaxScale 2.1
This commit is contained in:
MassimilianoPinto
2017-11-29 18:22:05 +01:00
parent 4ee9f54f5d
commit 2217091019
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -2658,30 +2658,6 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
/* force slave to read events via catchup routine */ /* force slave to read events via catchup routine */
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
} }
/**
* Handle Heartbeat: don't check anything else
* set CS_WAIT_DATA and return
*/
else if (hdr.ok == SLAVE_POS_READ_OK &&
slave->lastEventReceived == HEARTBEAT_EVENT)
{
#ifndef BLFILE_IN_SLAVE
blr_close_binlog(router, file);
#endif
spinlock_acquire(&router->binlog_lock);
spinlock_acquire(&slave->catch_lock);
/**
* Set the CS_WAIT_DATA that allows notification
* of new events after HEARTBEAT_EVENT
*/
slave->cstate |= CS_WAIT_DATA;
spinlock_release(&slave->catch_lock);
spinlock_release(&router->binlog_lock);
return 1;
}
else if (slave->binlog_pos == router->binlog_position && else if (slave->binlog_pos == router->binlog_position &&
strcmp(slave->binlogfile, router->binlog_name) == 0) strcmp(slave->binlogfile, router->binlog_name) == 0)
{ {