error in comment fixed

[redis.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index d610d2a97d4fe96d677d1d7edcff3a12c422b492..d218f0f93179fc74e4ff4fc53c12cbf04bee4a2d 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -216,12 +216,12 @@ void debugCommand(redisClient *c) {
         if (c->argc >= 3) c->argv[2] = tryObjectEncoding(c->argv[2]);
         redisAssertWithInfo(c,c->argv[0],1 == 2);
     } else if (!strcasecmp(c->argv[1]->ptr,"reload")) {
         if (c->argc >= 3) c->argv[2] = tryObjectEncoding(c->argv[2]);
         redisAssertWithInfo(c,c->argv[0],1 == 2);
     } else if (!strcasecmp(c->argv[1]->ptr,"reload")) {

-        if (rdbSave(server.dbfilename) != REDIS_OK) {
+        if (rdbSave(server.rdb_filename) != REDIS_OK) {

             addReply(c,shared.err);
             return;
         }
         emptyDb();
             addReply(c,shared.err);
             return;
         }
         emptyDb();

-        if (rdbLoad(server.dbfilename) != REDIS_OK) {
+        if (rdbLoad(server.rdb_filename) != REDIS_OK) {

             addReplyError(c,"Error trying to load the RDB dump");
             return;
         }
             addReplyError(c,"Error trying to load the RDB dump");
             return;
         }


@@ -229,10 +229,11 @@ void debugCommand(redisClient *c) {
         addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
         emptyDb();
         addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
         emptyDb();

-        if (loadAppendOnlyFile(server.appendfilename) != REDIS_OK) {
+        if (loadAppendOnlyFile(server.aof_filename) != REDIS_OK) {

             addReply(c,shared.err);
             return;
         }
             addReply(c,shared.err);
             return;
         }

+        server.dirty = 0; /* Prevent AOF / replication */

         redisLog(REDIS_WARNING,"Append Only File loaded by DEBUG LOADAOF");
         addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"object") && c->argc == 3) {
         redisLog(REDIS_WARNING,"Append Only File loaded by DEBUG LOADAOF");
         addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"object") && c->argc == 3) {