From: antirez <antirez@gmail.com>
Date: Tue, 9 Aug 2011 09:46:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/b56567017dfc44b8e5071423423a48601cc4657e?hp=f65c8f654fafb6cc86804d8f4ca9cdd1b6d978db

Merge remote-tracking branch 'origin/unstable' into unstable
---

diff --git a/src/redis.c b/src/redis.c
index 0bedc25b..6b92018d 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -685,7 +685,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
              server.auto_aofrewrite_perc &&
              server.appendonly_current_size > server.auto_aofrewrite_min_size)
          {
-            int base = server.auto_aofrewrite_base_size ?
+            long long base = server.auto_aofrewrite_base_size ?
                             server.auto_aofrewrite_base_size : 1;
             long long growth = (server.appendonly_current_size*100/base) - 100;
             if (growth >= server.auto_aofrewrite_perc) {