Merge branch 'unstable' of github.com:antirez/redis into unstable

diff --git a/tests/unit/type/zset.tcl b/tests/unit/type/zset.tcl
index 4fa7af1b3513f6606ee9dea3019c728d176c3687..37668cfe2d949ba051f016de6588dec2517b2e38 100644 (file)
--- a/tests/unit/type/zset.tcl
+++ b/tests/unit/type/zset.tcl
@@ -460,6 +460,13 @@ start_server {tags {"zset"}} {
     basics ziplist
     basics skiplist
 
+    test {ZINTERSTORE regression with two sets, intset+hashtable} {
+        r del seta setb setc
+        r sadd set1 a
+        r sadd set2 10
+        r zinterstore set3 2 set1 set2
+    } {0}
+
     proc stressers {encoding} {
         if {$encoding == "ziplist"} {
             # Little extra to allow proper fuzzing in the sorting stresser