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

Merge 2.1 into 2.2

Browse Source 
Merge 2.1 into 2.2
This commit is contained in:
MassimilianoPinto
2017-11-30 09:15:42 +01:00
parent 0c2846e48f
commit aa35b202ec
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

@ -2691,30 +2691,6 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
ss_dassert(hdr.ok == SLAVE_POS_READ_OK); ss_dassert(hdr.ok == SLAVE_POS_READ_OK);
/**
* Handle Heartbeat: don't check anything else
* set CS_WAIT_DATA and return
*/
if (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;
}
/** /**
* Check now slave position with read indicator = SLAVE_POS_READ_OK * Check now slave position with read indicator = SLAVE_POS_READ_OK
* *