merged intset code into the split files

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 86536b4375a0ec0938da0b6b8691a62194efb819..7809d05772c52bcf3c5b0d3f7a7f0506ca886b90 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -731,6 +731,7 @@ void initServerConfig() {
     server.hash_max_zipmap_value = REDIS_HASH_MAX_ZIPMAP_VALUE;
     server.list_max_ziplist_entries = REDIS_LIST_MAX_ZIPLIST_ENTRIES;
     server.list_max_ziplist_value = REDIS_LIST_MAX_ZIPLIST_VALUE;
     server.hash_max_zipmap_value = REDIS_HASH_MAX_ZIPMAP_VALUE;
     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.shutdown_asap = 0;
 
     resetServerSaveParams();
     server.shutdown_asap = 0;
 
     resetServerSaveParams();