Fix or cas by key.

diff --git a/ChangeLog b/ChangeLog
index fac9a6a0edfdeae7bfd0e5219959ddf506350b67..70377ed5742b94e103c6fa2b30a46a2e12707d06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.19
+  * Read through cached support.
+  * Fixed for cas by key operation.
+
+
 0.18 Sun Mar 16 21:57:55 PDT 2008
   * Fix plus tests for non-zero value objects and flags.
   * MEMCACHED_HASH_MURMUR added for murmur algorithm provided.

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 2b08d39603bc7bd7c7f2a8de0e7e970ad3ae570d..47556e857b309819d0f2fb5b0d0087ca58c34ac0 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -42,8 +42,8 @@ size_t memcached_result_length(memcached_result_st *ptr);
 #define memcached_result_flags(A) (A)->flags
 #define memcached_result_cas(A) (A)->cas
 memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length);
-void memcached_result_set_flags(A,B) (A)->flags= B
-void memcached_result_set_expiration(A) (A)->expiration
+#define memcached_result_set_flags(A,B) (A)->flags=(B)
+#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
 
 #ifdef __cplusplus
 }

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index fb3e6b2bc8027a64658c337e50ec807fe7c36af3..0f6daa4ec1fa2b5568ad762730c25ef8b1867ef8 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -295,7 +295,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;