Fix merge issues in 490847c.

This commit is contained in:
antirez 2015-09-07 17:29:13 +02:00
parent 490847c681
commit ce4c17308e

View File

@ -1510,12 +1510,12 @@ int rdbSaveToSlavesSockets(void) {
* replicationSetupSlaveForFullResync() turned it into BGSAVE_END */ * replicationSetupSlaveForFullResync() turned it into BGSAVE_END */
listRewind(server.slaves,&li); listRewind(server.slaves,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
client *slave = ln->value; redisClient *slave = ln->value;
int j; int j;
for (j = 0; j < numfds; j++) { for (j = 0; j < numfds; j++) {
if (slave->id == clientids[j]) { if (slave->id == clientids[j]) {
slave->replstate = SLAVE_STATE_WAIT_BGSAVE_START; slave->replstate = REDIS_REPL_WAIT_BGSAVE_START;
break; break;
} }
} }