gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source 
Former-commit-id: b22d9cc27d0434578891c59825f1c8813a3a9b28
This commit is contained in:
John Sully 2020-03-25 22:26:27 -04:00
parent 9c4b66b9a4
commit f4caa84987
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/replication.cpp
View File

@ -3870,7 +3870,7 @@ void replicaReplayCommand(client *c)
RemoteMasterState &remoteState = g_mapremote[uuid]; RemoteMasterState &remoteState = g_mapremote[uuid];
if (remoteState.cFake == nullptr) if (remoteState.cFake == nullptr)
remoteState.cFake = createClient(-1, c->iel); remoteState.cFake = createClient(nullptr, c->iel);
else else
remoteState.cFake->iel = c->iel; remoteState.cFake->iel = c->iel;
@ -3885,11 +3885,6 @@ void replicaReplayCommand(client *c)
// OK We've recieved a command lets execute // OK We've recieved a command lets execute
client *current_clientSave = serverTL->current_client; client *current_clientSave = serverTL->current_client;
<<<<<<< HEAD
if (cFake == nullptr)
cFake = createClient(nullptr, c->iel);
=======
>>>>>>> unstable
cFake->lock.lock(); cFake->lock.lock();
cFake->authenticated = c->authenticated; cFake->authenticated = c->authenticated;
cFake->puser = c->puser; cFake->puser = c->puser;