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

Variable moved

Browse Source 
Variable moved
This commit is contained in:
MassimilianoPinto
2016-01-11 09:59:22 +01:00
parent 1b0c7d0d90
commit 0a3f20f8af
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1697,7 +1697,6 @@ uint8_t *ptr;
int len, rval, binlognamelen; int len, rval, binlognamelen;
REP_HEADER hdr; REP_HEADER hdr;
uint32_t chksum; uint32_t chksum;
bool force_disconnect = false;
ptr = GWBUF_DATA(queue); ptr = GWBUF_DATA(queue);
len = extract_field(ptr, 24); len = extract_field(ptr, 24);
@ -1731,6 +1730,8 @@ bool force_disconnect = false;
* Force slave disconnection if requested position is unsafe. * Force slave disconnection if requested position is unsafe.
*/ */
bool force_disconnect = false;
spinlock_acquire(&router->binlog_lock); spinlock_acquire(&router->binlog_lock);
if (router->pending_transaction && strcmp(router->binlog_name, slave->binlogfile) == 0 && if (router->pending_transaction && strcmp(router->binlog_name, slave->binlogfile) == 0 &&
(slave->binlog_pos > router->binlog_position) && !router->rotating) (slave->binlog_pos > router->binlog_position) && !router->rotating)