From ef3ac64a27519c65370fbe6877c514e58a29d644 Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 12 Nov 2009 21:49:15 +0100 Subject: [PATCH] Solaris fix thanks to Alan Harder --- Changelog | 13 +++++++++++++ redis.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 683fae5d..7b7d88cc 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,16 @@ +2009-11-12 Merge git://github.com/ianxm/redis +2009-11-12 ZSCORE fixed, now returns NULL on missing key or missing element +2009-11-12 Redis test will not fail the SAVE test even if a background save is in progress +2009-11-12 LPOPPUSH renamed into RPOPLPUSH +2009-11-11 can select db num +2009-11-11 Workaround for test-redis.tcl and Tcl 8.4.x about ZSCORE test +2009-11-11 Removed a long time warning compiling with recent GCC on Linux +2009-11-11 TODO updated +2009-11-11 LPUSHPOP first implementation +2009-11-10 Tcl script, make target, and redis.c changes to build the static symbol table automagically +2009-11-10 Implemented a much better lazy expiring algorithm for EXPIRE +2009-11-10 Fixed issue 92 in redis: redis-cli (nil) return value lacks CR/LF +2009-11-10 Minor TODO change with new expiring algorithm description. New expiring algorithm moved since it'll go in 1.1 2009-11-04 redis-test is now a better Redis citizen, testing everything against DB 9 and 10 and only if this DBs are empty. 2009-11-04 fixed a refcounting bug with SORT ... STORE leading to random crashes 2009-11-04 masterauth option merged, thanks to Anthony Lauzon diff --git a/redis.c b/redis.c index 470191da..65fc9e3b 100644 --- a/redis.c +++ b/redis.c @@ -906,7 +906,7 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD /* Check if a background saving in progress terminated */ if (server.bgsaveinprogress) { int statloc; - if (wait4(-1,&statloc,WNOHANG,NULL)) { + if (wait3(&statloc,WNOHANG,NULL)) { int exitcode = WEXITSTATUS(statloc); int bysignal = WIFSIGNALED(statloc); -- 2.45.2