Fixed another merge typo

This commit is contained in:
antirez 2011-07-15 18:04:41 +02:00
parent 3fee7e3013
commit 9702c92c4f

View File

@ -495,7 +495,6 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
addReply(c,shared.czero); addReply(c,shared.czero);
return; return;
} }
if (seconds <= 0 && !server.loading) {
/* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past /* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past
* should never be executed as a DEL when load the AOF or in the context * should never be executed as a DEL when load the AOF or in the context
* of a slave instance. * of a slave instance.