From: antirez <antirez@gmail.com>
Date: Wed, 22 Sep 2010 14:09:30 +0000 (+0200)
Subject: preventive conflict resolution to merge pietern/zset-mem
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/5ca2f0c49894878be47161f667ae0daf70bb6fd3

preventive conflict resolution to merge pietern/zset-mem
---

diff --git a/src/t_zset.c b/src/t_zset.c
index d944e923..e3eb8325 100644
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i
             *score = scoreval;
         }
         if (isnan(*score)) {
-            addReplyError(c,"resulting score is not a number (NaN)");
+            addReplySds(c,
+                sdsnew("-ERR resulting score is not a number (NaN)\r\n"));
             zfree(score);
             /* Note that we don't need to check if the zset may be empty and
              * should be removed here, as we can only obtain Nan as score if