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

Merge branch 'blr' into develop

Browse Source 
Addition of hashtable load and save. Caching of auth information
This commit is contained in:
Mark Riddoch
2015-02-06 11:52:51 +00:00
parent adc0bb4f70 25e39f35c5
commit d4f5ca6bcb
7 changed files with 385 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,7 +1457,8 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
if (slave->binlog_pos >= blr_file_size(slave->file)
&& router->rotating == 0
&& strcmp(router->binlog_name, slave->binlogfile) != 0
&& blr_master_connected(router))
&& (blr_master_connected(router)
|| blr_file_next_exists(router, slave)))
{
/* We may have reached the end of file of a non-current
* binlog file.
@ -1487,7 +1488,7 @@ if (hkheartbeat - beat1 > 1) LOGIF(LE, (skygw_log_write(
dcb_close(slave->dcb);
}
}
else
else if (blr_master_connected(router))
{
spinlock_acquire(&slave->catch_lock);
slave->cstate |= CS_EXPECTCB;