Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / storage.cc

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 2d0ae8fc5b4ce7e2693fd61fe84a30c0113a8509..1d75eb9a3aa143d21c4406aa30f73bf8849181e4 100644 (file)
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -175,10 +175,12 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
   {
     memcached_io_reset(server);
 
+#if 0
     if (memcached_has_error(ptr))
     {
       memcached_set_error(*server, rc, MEMCACHED_AT);
     }
+#endif
 
     return MEMCACHED_WRITE_FAILURE;
   }
@@ -319,10 +321,12 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr,
   }
 
   assert(memcached_failed(rc));
+#if 0
   if (memcached_has_error(ptr) == false)
   {
     return memcached_set_error(*ptr, rc, MEMCACHED_AT);
   }
+#endif
 
   return rc;
 }
@@ -342,14 +346,9 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
     return rc;
   }
 
-  if (memcached_failed(rc= memcached_validate_key_length(key_length, memcached_is_binary(ptr))))
-  {
-    return rc;
-  }
-
   if (memcached_failed(memcached_key_test(*ptr, (const char **)&key, &key_length, 1)))
   {
-    return MEMCACHED_BAD_KEY_PROVIDED;
+    return memcached_last_error(ptr);
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
@@ -408,10 +407,6 @@ memcached_return_t memcached_add(memcached_st *ptr,
                      key, key_length, value, value_length,
                      expiration, flags, 0, ADD_OP);
 
-  if (rc == MEMCACHED_NOTSTORED or rc == MEMCACHED_DATA_EXISTS)
-  {
-    memcached_set_error(*ptr, rc, MEMCACHED_AT);
-  }
   LIBMEMCACHED_MEMCACHED_ADD_END();
   return rc;
 }