From:  <brian@gir-2.local>
Date: Tue, 18 Mar 2008 22:14:53 +0000 (-0700)
Subject: Fix or cas by key.
X-Git-Tag: _20~1^2~45
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e46de6497d3b9c26c4ae6c44acfdfa1582ccf8bc;p=m6w6%2Flibmemcached

Fix or cas by key.
---

diff --git a/ChangeLog b/ChangeLog
index fac9a6a0..70377ed5 100644
--- 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 2b08d396..47556e85 100644
--- 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 fb3e6b2b..0f6daa4e 100644
--- 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;