From 871c86717caa63ffab0a25160f82ae2c26af3b4f Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Sun, 16 Jun 2019 20:57:12 -0400
Subject: [PATCH] Fix test failures due to assert

Former-commit-id: 9c901eb65f98008f0962c5edc33aadc15ec6f619
---
 src/multi.cpp  | 1 -
 src/server.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/multi.cpp b/src/multi.cpp
index 262a8f1d0..3383f5a49 100644
--- a/src/multi.cpp
+++ b/src/multi.cpp
@@ -82,7 +82,6 @@ void discardTransaction(client *c) {
 /* Flag the transacation as DIRTY_EXEC so that EXEC will fail.
  * Should be called every time there is an error while queueing a command. */
 void flagTransaction(client *c) {
-    serverAssert(GlobalLocksAcquired());
     if (c->flags & CLIENT_MULTI)
         c->flags |= CLIENT_DIRTY_EXEC;
 }
diff --git a/src/server.cpp b/src/server.cpp
index fdd1de4d2..6bb90a122 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -5134,7 +5134,7 @@ int main(int argc, char **argv) {
     if (background) daemonize();
 
     initServer();
-    initNetworking(/*cserver.cthreads >*/ 1 /* fReusePort */);
+    initNetworking(cserver.cthreads > 1 /* fReusePort */);
 
     if (background || cserver.pidfile) createPidFile();
     redisSetProcTitle(argv[0]);