usage information updated to reflect the new way to pass options to Redis from the...

[redis.git] / src / multi.c

diff --git a/src/multi.c b/src/multi.c
index f0b8fc8566e4c3021ba635142083d00864d87472..5c88340055ce6104171ac3e33febb0105c6ad7b8 100644 (file)
--- a/src/multi.c
+++ b/src/multi.c
@@ -57,7 +57,7 @@ void discardCommand(redisClient *c) {
 
     freeClientMultiState(c);
     initClientMultiState(c);
 
     freeClientMultiState(c);
     initClientMultiState(c);

-    c->flags &= (~REDIS_MULTI);
+    c->flags &= ~(REDIS_MULTI|REDIS_DIRTY_CAS);;

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


@@ -194,7 +194,7 @@ void unwatchAllKeys(redisClient *c) {
          * from the list */
         wk = listNodeValue(ln);
         clients = dictFetchValue(wk->db->watched_keys, wk->key);
          * from the list */
         wk = listNodeValue(ln);
         clients = dictFetchValue(wk->db->watched_keys, wk->key);

-        redisAssert(clients != NULL);
+        redisAssertWithInfo(c,NULL,clients != NULL);

         listDelNode(clients,listSearchKey(clients,c));
         /* Kill the entry at all if this was the only client */
         if (listLength(clients) == 0)
         listDelNode(clients,listSearchKey(clients,c));
         /* Kill the entry at all if this was the only client */
         if (listLength(clients) == 0)