Commit ce4c1730 authored by antirez's avatar antirez
Browse files

Fix merge issues in 490847c6.

parent 490847c6
...@@ -1510,12 +1510,12 @@ int rdbSaveToSlavesSockets(void) { ...@@ -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;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment