Merge branch 'master' into intset-split

Conflicts:
	src/Makefile
	src/t_set.c
This commit is contained in:
Pieter Noordhuis
2010-08-20 12:40:29 +02:00
37 changed files with 931 additions and 452 deletions

View File

@ -194,6 +194,7 @@ struct redisClient *createFakeClient(void) {
* so that Redis will not try to send replies to this client. */
c->replstate = REDIS_REPL_WAIT_BGSAVE_START;
c->reply = listCreate();
c->watched_keys = listCreate();
listSetFreeMethod(c->reply,decrRefCount);
listSetDupMethod(c->reply,dupClientReplyValue);
initClientMultiState(c);
@ -203,6 +204,7 @@ struct redisClient *createFakeClient(void) {
void freeFakeClient(struct redisClient *c) {
sdsfree(c->querybuf);
listRelease(c->reply);
listRelease(c->watched_keys);
freeClientMultiState(c);
zfree(c);
}