conflict resolved in cherry pick

29920dce · antirez · f96a9f82 · 29920dce
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

src/redis.c src/redis.c +1 -0

未找到文件。
--- a/src/redis.c
+++ b/src/redis.c
@@ -945,6 +945,7 @@ void initServer() {
    }

    if (server.ds_enabled) dsInit();
+    srand(time(NULL)^getpid());
 }

 /* Populates the Redis Command Table starting from the hard coded list