Merge Monty

diff --git a/ChangeLog b/ChangeLog
index 893332cf576a6ace3bb73f0e5d9d190a09f6200c..5adef907c94504b789c4fc2b13fb690294abbd86 100644 (file)
--- 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 3634dce83a214e3e9a632197e5752d02a646a3d0..aa80f8c209ba25090e014b8d75f282b8c5f787ab 100644 (file)
--- 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)
   {