X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdo.cc;h=2ce64483485a92c08da9c46a5d4cf2be49eb2235;hb=a11ae747b7dec5587f623e34099e7cd132c08604;hp=ed66028c3eb2b5458e60adce77ef69630a918e6b;hpb=ef3cb20e2967fc17cf7f1c5b6eb14e84bc88a7dc;p=awesomized%2Flibmemcached

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index ed66028c..2ce64483 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -65,7 +65,6 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
           return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
         }
 
-        perror(__func__);
         return memcached_set_errno(*instance, errno, MEMCACHED_AT);
       }
     }
@@ -82,9 +81,14 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
 
   if (sent_length == -1 or size_t(sent_length) != command_length)
   {
-    rc= MEMCACHED_WRITE_FAILURE;
-    WATCHPOINT_ERROR(rc);
-    WATCHPOINT_ERRNO(errno);
+    if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
+    {
+      return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    }
+    else
+    {
+      rc= MEMCACHED_WRITE_FAILURE;
+    }
   }
   else if (memcached_is_replying(instance->root))
   {