Allow AUTH when Redis is busy because of timedout Lua script.

[redis.git] / src / multi.c

diff --git a/src/multi.c b/src/multi.c
index 65ec38a8d0e34b8a1c908d7056f9281314e5258e..eee9748c5fabb0b0fa5745c23c6f4b1533151ebf 100644 (file)
--- a/src/multi.c
+++ b/src/multi.c
@@ -40,6 +40,13 @@ void queueMultiCommand(redisClient *c) {
     c->mstate.count++;
 }
 
     c->mstate.count++;
 }
 

+void discardTransaction(redisClient *c) {
+    freeClientMultiState(c);
+    initClientMultiState(c);
+    c->flags &= ~(REDIS_MULTI|REDIS_DIRTY_CAS);;
+    unwatchAllKeys(c);
+}
+

 void multiCommand(redisClient *c) {
     if (c->flags & REDIS_MULTI) {
         addReplyError(c,"MULTI calls can not be nested");
 void multiCommand(redisClient *c) {
     if (c->flags & REDIS_MULTI) {
         addReplyError(c,"MULTI calls can not be nested");


@@ -54,11 +61,7 @@ void discardCommand(redisClient *c) {
         addReplyError(c,"DISCARD without MULTI");
         return;
     }
         addReplyError(c,"DISCARD without MULTI");
         return;
     }

-
-    freeClientMultiState(c);
-    initClientMultiState(c);
-    c->flags &= ~(REDIS_MULTI|REDIS_DIRTY_CAS);;
-    unwatchAllKeys(c);
+    discardTransaction(c);

     addReply(c,shared.ok);
 }
 
     addReply(c,shared.ok);
 }