Merge branch '2.8' of https://github.com/MSOpenTech/Redis into 2.8

Conflicts:
	bin/release/redis-2.8.9.zip

src/anet.c

@@ -460,9 +460,9 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len, int
     }
 
 #ifdef _WIN32
-    if (aeWinListen(s, 512) == SOCKET_ERROR) {
+    if (aeWinListen(s, backlog) == SOCKET_ERROR) {
 #else
-    if (listen(s, 511) == -1) {
+    if (listen(s, backlog) == -1) {
 #endif
         anetSetError(err, "listen: %s", strerror(errno));
         close(s);

src/debug.c

@@ -371,6 +371,16 @@ void debugCommand(redisClient *c) {
     {
         server.active_expire_enabled = atoi(c->argv[2]->ptr);
         addReply(c,shared.ok);
+#ifdef _WIN32
+    } else if (!strcasecmp(c->argv[1]->ptr, "flushload")) {
+        emptyDb(NULL);
+        if (rdbLoad(server.rdb_filename) != REDIS_OK) {
+            addReplyError(c, "Error trying to load the RDB dump");
+            return;
+        }
+        redisLog(REDIS_WARNING, "DB reloaded by DEBUG flushload");
+        addReply(c, shared.ok);
+#endif
     } else if (!strcasecmp(c->argv[1]->ptr,"error") && c->argc == 3) {
         sds errstr = sdsnewlen("-",1);
 

src/redis.c

@@ -2493,9 +2493,9 @@ sds genRedisInfoString(char *section) {
             "used_memory_lua:%lld\r\n"
             "mem_fragmentation_ratio:%.2f\r\n"
             "mem_allocator:%s\r\n",
-            (long long)zmalloc_used_memory(),
+            (long long)zmalloc_used,
             hmem,
-            (long long)zmalloc_get_rss(),
+            (long long)server.resident_set_size,
             (long long)server.stat_peak_memory,
             peak_hmem,
             ((long long)lua_gc(server.lua,LUA_GCCOUNT,0))*1024LL,
@@ -2543,7 +2543,8 @@ sds genRedisInfoString(char *section) {
             "aof_rewrite_scheduled:%d\r\n"
             "aof_last_rewrite_time_sec:%lld\r\n"
             "aof_current_rewrite_time_sec:%lld\r\n"
-            "aof_last_bgrewrite_status:%s\r\n",
+            "aof_last_bgrewrite_status:%s\r\n"
+            "aof_last_write_status:%s\r\n", 
             server.loading,
             server.dirty,
             server.rdb_child_pid != -1,
@@ -2558,7 +2559,8 @@ sds genRedisInfoString(char *section) {
             (long long)server.aof_rewrite_time_last,
             (server.aof_child_pid == -1) ?
                 (long long)-1 : (long long)(time(NULL)-server.aof_rewrite_time_start),
-            (server.aof_lastbgrewrite_status == REDIS_OK) ? "ok" : "err");
+            (server.aof_lastbgrewrite_status == REDIS_OK) ? "ok" : "err",
+            (server.aof_last_write_status == REDIS_OK) ? "ok" : "err");
 #else
     /* Persistence */
     if (allsections || defsections || !strcasecmp(section,"persistence")) {