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

Fix test failures due to assert

Browse Source 
Former-commit-id: 9c901eb65f98008f0962c5edc33aadc15ec6f619
This commit is contained in:
John Sully 2019-06-16 20:57:12 -04:00
parent 9ca83cc9fd
commit 871c86717c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/multi.cpp
View File

@ -82,7 +82,6 @@ void discardTransaction(client *c) {
/* Flag the transacation as DIRTY_EXEC so that EXEC will fail. /* Flag the transacation as DIRTY_EXEC so that EXEC will fail.
* Should be called every time there is an error while queueing a command. */ * Should be called every time there is an error while queueing a command. */
void flagTransaction(client *c) { void flagTransaction(client *c) {
serverAssert(GlobalLocksAcquired());
if (c->flags & CLIENT_MULTI) if (c->flags & CLIENT_MULTI)
c->flags |= CLIENT_DIRTY_EXEC; c->flags |= CLIENT_DIRTY_EXEC;
} }

2
src/server.cpp
View File

@ -5134,7 +5134,7 @@ int main(int argc, char **argv) {
if (background) daemonize(); if (background) daemonize();
initServer(); initServer();
initNetworking(/*cserver.cthreads >*/ 1 /* fReusePort */); initNetworking(cserver.cthreads > 1 /* fReusePort */);
if (background || cserver.pidfile) createPidFile(); if (background || cserver.pidfile) createPidFile();
redisSetProcTitle(argv[0]); redisSetProcTitle(argv[0]);