Fixed issue #121

diff --git a/redis.c b/redis.c
index 98fbe22f13616f1ba3a08d0461fb16d41c57d9ec..f28b940adf4a17478704475634e5950b30216d56 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -3961,7 +3961,7 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, unsigned long
             zfree(dv);
             if (dstkey) {
                 deleteKey(c->db,dstkey);
             zfree(dv);
             if (dstkey) {
                 deleteKey(c->db,dstkey);

-                addReply(c,shared.ok);
+                addReply(c,shared.czero);

             } else {
                 addReply(c,shared.nullmultibulk);
             }
             } else {
                 addReply(c,shared.nullmultibulk);
             }

diff --git a/test-redis.tcl b/test-redis.tcl
index 162a3b835c4a68a7ee13877296db8a2748fc724d..751059de26a2634766973a428a80fed50fc23e34 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -52,6 +52,19 @@ proc zlistAlikeSort {a b} {
     string compare [lindex $a 1] [lindex $b 1]
 }
 
     string compare [lindex $a 1] [lindex $b 1]
 }
 

+proc waitForBgsave r {
+    while 1 {
+        set i [$r info]
+        if {[string match {*bgsave_in_progress:1*} $i]} {
+            puts -nonewline "\nWaiting for background save to finish... "
+            flush stdout
+            after 1000
+        } else {
+            break
+        }
+    }
+}
+

 proc main {server port} {
     set r [redis $server $port]
     $r select 9
 proc main {server port} {
     set r [redis $server $port]
     $r select 9


@@ -633,16 +646,7 @@ proc main {server port} {
 
     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate
 
     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate

-        while 1 {
-            set i [$r info]
-            if {[string match {*bgsave_in_progress:1*} $i]} {
-                puts -nonewline "\nWaiting for background save to finish... "
-                flush stdout
-                after 100
-            } else {
-                break
-            }
-        }
+        waitForBgsave $r

         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}
         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}


@@ -1210,6 +1214,16 @@ proc main {server port} {
         } {0}
     }
 
         } {0}
     }
 

+    test {BGSAVE} {
+        $r flushdb
+        $r save
+        $r set x 10
+        $r bgsave
+        waitForBgsave $r
+        $r debug reload
+        $r get x
+    } {10}
+

     # Leave the user with a clean DB before to exit
     test {FLUSHDB} {
         set aux {}
     # Leave the user with a clean DB before to exit
     test {FLUSHDB} {
         set aux {}