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

diff --git a/src/redis.c b/src/redis.c
index 0bedc25b38c8c6250f882e0fa07e08b9986548a7..6b92018df3e7b3c3cdc4cf5e46fa8a3431fa4dca 100644 (file)
--- 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) {