[memcached] sgrimm, r416: Fix a merge error from the previous comm...

commits at code.sixapart.com commits at code.sixapart.com
Sun Oct 15 08:27:07 UTC 2006


Fix a merge error from the previous commit.


U   branches/performance/server/assoc.c


Modified: branches/performance/server/assoc.c
===================================================================
--- branches/performance/server/assoc.c	2006-10-15 08:13:00 UTC (rev 415)
+++ branches/performance/server/assoc.c	2006-10-15 08:27:06 UTC (rev 416)
@@ -581,7 +581,7 @@
     uint32_t hv;
     int oldbucket;
 
-    assert(assoc_find(key) == 0);  /* shouldn't have duplicately named things defined */
+    assert(assoc_find(ITEM_key(it)) == 0);  /* shouldn't have duplicately named things defined */
 
     hv = hash(ITEM_key(it), strlen(ITEM_key(it)), 0);
     if (expanding &&




More information about the memcached-commits mailing list