From: Brian Aker <brian@gaz>
Date: Wed, 8 Jul 2009 23:12:50 +0000 (-0700)
Subject: Bug found by Dustin via ICC
X-Git-Tag: 0.31~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c809a629b8654c8cda516794e5dc3171e2f9c30d;p=m6w6%2Flibmemcached

Bug found by Dustin via ICC
---

diff --git a/ChangeLog b/ChangeLog
index 893332cf..5adef907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-0.31
+0.31 Wed Jul  8 15:46:34 PDT 2009
   * Added support or HA via replication.
   * malloc() removed for server key usage.
   * Update build system.
diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index 3634dce8..aa80f8c2 100644
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -172,7 +172,7 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
 uint64_t memcached_behavior_get(memcached_st *ptr, 
                                 memcached_behavior flag)
 {
-  memcached_flags temp_flag= 0;
+  memcached_flags temp_flag= MEM_NO_BLOCK;
 
   switch (flag)
   {