From: antirez <antirez@gmail.com>
Date: Thu, 12 May 2011 18:21:00 +0000 (+0200)
Subject: Merge branch 'unstable' of github.com:antirez/redis into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/06d22a8a8ac309be1c553e307afbf46d22020410?hp=defb5f66a090c614aa70aee9e1923ec571e0e911

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 4fa7af1b..37668cfe 100644
--- 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