Fix for ZUNIONSTORE bug when there is an empty set among input sets. Regression test...

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index 2557f5b8dd193dae3e6f5c3aff665d74f098fcd9..eeafc053d30fbbcf4471ee935f3b562cfb6a28b6 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -425,7 +425,7 @@ int rdbSave(char *filename) {
             strerror(errno));
         return REDIS_ERR;
     }
-    if (fwrite("REDIS0001",9,1,fp) == 0) goto werr;
+    if (fwrite("REDIS0002",9,1,fp) == 0) goto werr;
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;
         dict *d = db->dict;
@@ -931,7 +931,7 @@ int rdbLoad(char *filename) {
         return REDIS_ERR;
     }
     rdbver = atoi(buf+5);
-    if (rdbver != 1) {
+    if (rdbver < 1 || rdbver > 2) {
         fclose(fp);
         redisLog(REDIS_WARNING,"Can't handle RDB format version %d",rdbver);
         return REDIS_ERR;