mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
maxmemory didn't worked in 64 systems for values > 4GB since it used to be an unsigned int. Fixed
This commit is contained in:
parent
244de507b3
commit
d446590041
4
redis.c
4
redis.c
@ -269,7 +269,7 @@ struct redisServer {
|
||||
redisClient *master; /* client that is master for this slave */
|
||||
int replstate;
|
||||
unsigned int maxclients;
|
||||
unsigned int maxmemory;
|
||||
unsigned long maxmemory;
|
||||
/* Sort parameters - qsort_r() is only available under BSD so we
|
||||
* have to take this state global, in order to pass it to sortCompare() */
|
||||
int sort_desc;
|
||||
@ -1116,7 +1116,7 @@ static void loadServerConfig(char *filename) {
|
||||
} else if (!strcasecmp(argv[0],"maxclients") && argc == 2) {
|
||||
server.maxclients = atoi(argv[1]);
|
||||
} else if (!strcasecmp(argv[0],"maxmemory") && argc == 2) {
|
||||
server.maxmemory = atoi(argv[1]);
|
||||
server.maxmemory = strtoll(argv[1], NULL, 10);
|
||||
} else if (!strcasecmp(argv[0],"slaveof") && argc == 3) {
|
||||
server.masterhost = sdsnew(argv[1]);
|
||||
server.masterport = atoi(argv[2]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user