From:  <brian@gir-2.local>
Date: Fri, 29 Feb 2008 07:22:14 +0000 (-0800)
Subject: Branch merge for fixes in reconnect.
X-Git-Tag: _20~1^2~55^2~1^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2f58ddc89656a2367c20ab50cef8e2fc5f476319;p=m6w6%2Flibmemcached

Branch merge for fixes in reconnect.
---

2f58ddc89656a2367c20ab50cef8e2fc5f476319
diff --cc ChangeLog
index f3cd040b,199536b5..3a9e3afa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,6 @@@
 +  * Replication support has been added to the library.
 +
- 0.17
+ 0.17 Wed Feb 27 03:33:29 PST 2008
    * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in
      non-block mode.
    * Incompatible change in memcached_behavior_set() api. We now use a
diff --cc lib/memcached_storage.c
index 3b1ee242,0b5a73e1..2a0f88d4
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@@ -53,14 -53,10 +53,11 @@@ static inline memcached_return memcache
    char to_write;
    size_t write_length;
    ssize_t sent_length;
 -  memcached_return rc;
 +  memcached_return rc[MEMCACHED_MAX_REPLICAS];
    char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
    unsigned int server_key;
 +  uint8_t replicas= 0;
  
-   WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-   WATCHPOINT_ASSERT(!(value && value_length == 0));
- 
    unlikely (key_length == 0)
      return MEMCACHED_NO_KEY_PROVIDED;