Fixing merge

[m6w6/libmemcached] / libmemcached / memcached_storage.c

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index fb3e6b2bc8027a64658c337e50ec807fe7c36af3..30afd2634fc5a9406844b349b83443d1a29a6719 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -58,7 +58,6 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   unsigned int server_key;
 
   WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-  WATCHPOINT_ASSERT(!(value && value_length == 0));
 
   unlikely (key_length == 0)
     return MEMCACHED_NO_KEY_PROVIDED;
@@ -295,7 +294,7 @@ memcached_return memcached_cas_by_key(memcached_st *ptr,
                                       uint64_t cas)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, cas, CAS_OP);
   return rc;