Fixed bug in getClientInfoString() that was not rendering the N (no flags) special...

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index bb9121c88f5e4b793339e08a07ae31ea676ebf29..2c0feb6ded874318b19226a14ea6026c58d705e5 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -597,7 +597,7 @@ int rdbSave(char *filename) {
     dictEntry *de;
     char tmpfile[256];
     int j;
     dictEntry *de;
     char tmpfile[256];
     int j;

-    time_t now = mstime();
+    long long now = mstime();

     FILE *fp;
     rio rdb;
 
     FILE *fp;
     rio rdb;
 


@@ -997,7 +997,7 @@ int rdbLoad(char *filename) {
             if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr;
             /* We read the time so we need to read the object type again. */
             if ((type = rdbLoadType(&rdb)) == -1) goto eoferr;
             if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr;
             /* We read the time so we need to read the object type again. */
             if ((type = rdbLoadType(&rdb)) == -1) goto eoferr;

-            /* the EXPIREITME opcode specifies time in seconds, so convert
+            /* the EXPIRETIME opcode specifies time in seconds, so convert

              * into milliesconds. */
             expiretime *= 1000;
         } else if (type == REDIS_RDB_OPCODE_EXPIRETIME_MS) {
              * into milliesconds. */
             expiretime *= 1000;
         } else if (type == REDIS_RDB_OPCODE_EXPIRETIME_MS) {