version bumped to 2.0.4, release note for this version added

00-RELEASENOTES

@@ -1,3 +1,19 @@
+Welcome to Redis 2.0.4
+
+This release fixes two non critical bugs:
+
+    - HMGET used to crash when called against a key that was not holding
+      an hash. Fixed by Pieter Noordhuis.
+    
+    - Redis will now not try to save the DB if no save points for RDB are
+      configured, when used as a non persistent cache. Thanks to Robey
+      Pointer from Twitter for providing this patch.
+
+Waiting 2.2 ...
+Salvatore
+
+--------------------------------------------------------------------------------
+
 Welcome to Redis 2.0.3
 
 This release fixes two important bugs:

redis.c

@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define REDIS_VERSION "2.0.3"
+#define REDIS_VERSION "2.0.4"
 
 #include "fmacros.h"
 #include "config.h"
@@ -4221,7 +4221,7 @@ static int prepareForShutdown() {
         /* Append only file: fsync() the AOF and exit */
         fsync(server.appendfd);
         if (server.vm_enabled) unlink(server.vm_swap_file);
-    } else {
+    } else if (server.saveparamslen > 0) {
         /* Snapshotting. Perform a SYNC SAVE and exit */
         if (rdbSave(server.dbfilename) == REDIS_OK) {
             if (server.daemonize)
@@ -4236,6 +4236,8 @@ static int prepareForShutdown() {
             redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit");
             return REDIS_ERR;
         }
+    } else {
+        redisLog(REDIS_WARNING,"Not saving DB.");
     }
     redisLog(REDIS_WARNING,"Server exit now, bye bye...");
     return REDIS_OK;
@@ -6707,6 +6709,7 @@ static void hmgetCommand(redisClient *c) {
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o != NULL && o->type != REDIS_HASH) {
         addReply(c,shared.wrongtypeerr);
+        return;
     }
 
     /* Note the check for o != NULL happens inside the loop. This is

tests/unit/type/hash.tcl

@@ -140,6 +140,11 @@ start_server {tags {"hash"}} {
         set _ $rv
     } {{{} {}} {{} {}} {{} {}}}
 
+    test {HMGET against wrong type} {
+        r set wrongtype somevalue
+        assert_error "*wrong*" {r hmget wrongtype field1 field2}
+    }
+
     test {HMGET - small hash} {
         set keys {}
         set vals {}