critical bug about glueoutputbuffers=yes fixed. Under load and with pipelining and...

diff --git a/TODO b/TODO
index 02a5f57728ed2e9e258cda1417d278ac52b191fb..f09830e22dac15a269eaad70a059fc5d28c0a58b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@ BEFORE REDIS 1.0.0-rc1
  * maxmemory support
  * maxclients support
  * Resize the expires and Sets hash tables if needed as well? For Sets the right moment to check for this is probably in SREM
- * TTL command that returns -1 if a key is not volatile otherwise the time to live of a volatile key in seconds.
  * What happens if the saving child gets killed or segfaults instead of ending normally? Handle this.
  * Make sinterstore / unionstore / sdiffstore returning the cardinality of the resulting set.
  * check 'server.dirty' everywere

diff --git a/redis.c b/redis.c
index 1e620a6c00bcaa31998731a460a6e1c8545828cb..ea7d4b277ee820ed79d7ad62bb0642237f6b6930 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1119,7 +1119,8 @@ static void glueReplyBuffersIfNeeded(redisClient *c) {
             listDelNode(c->reply,ln);
         }
         /* Now the output buffer is empty, add the new single element */
-        addReplySds(c,sdsnewlen(buf,totlen));
+        o = createObject(REDIS_STRING,sdsnewlen(buf,totlen));
+        if (!listAddNodeTail(c->reply,o)) oom("listAddNodeTail");
     }
 }