Merge branch 'unstable' into unstable-zset

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 9c726151fb66a87f5edbd7a712327ac982bbb640..3d0f53788640ce7f1c5d52e2b3d3faadefadf52c 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -840,6 +840,8 @@ void initServerConfig() {
     server.list_max_ziplist_entries = REDIS_LIST_MAX_ZIPLIST_ENTRIES;
     server.list_max_ziplist_value = REDIS_LIST_MAX_ZIPLIST_VALUE;
     server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES;
+    server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
+    server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
     server.shutdown_asap = 0;
     server.cache_flush_delay = 0;
     server.cluster_enabled = 0;