Merge branch 'zset-mem' into zrevrangebyscore

diff --cc src/redis.c
Simple merge

diff --cc src/redis.h
Simple merge

diff --cc src/t_zset.c
index d944e92329fca9d8f8f0033216dbf7f0ae631706,3d9f612afd66eb96c9f2d40584627c9dd5a799b2..93ade5aaf01b6f07d7c976594bd1aa194486b285
--- 1/src/t_zset.c
--- 2/src/t_zset.c
+++ b/src/t_zset.c
@@@ -339,24 -318,17 +318,16 @@@ void zaddGenericCommand(redisClient *c
      }
      zs = zsetobj->ptr;
  
-     /* Ok now since we implement both ZADD and ZINCRBY here the code
-      * needs to handle the two different conditions. It's all about setting
-      * '*score', that is, the new score to set, to the right value. */
-     score = zmalloc(sizeof(double));
-     if (doincrement) {
-         dictEntry *de;
- 
+     /* Since both ZADD and ZINCRBY are implemented here, we need to increment
+      * the score first by the current score if ZINCRBY is called. */
+     if (incr) {
          /* Read the old score. If the element was not present starts from 0 */
-         de = dictFind(zs->dict,ele);
-         if (de) {
-             double *oldscore = dictGetEntryVal(de);
-             *score = *oldscore + scoreval;
-         } else {
-             *score = scoreval;
-         }
-         if (isnan(*score)) {
+         dictEntry *de = dictFind(zs->dict,ele);
+         if (de != NULL)
+             score += *(double*)dictGetEntryVal(de);
+ 
+         if (isnan(score)) {
 -            addReplySds(c,
 -                sdsnew("-ERR resulting score is not a number (NaN)\r\n"));
 +            addReplyError(c,"resulting score is not a number (NaN)");
-             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
               * there was already an element in the sorted set. */