Update from OSX

[m6w6/libmemcached] / libmemcached / io.cc

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index 309df4c1dd3c3595121261b21250f5155ce28a06..e83522b984f99124429714469ea902db91c76336 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -203,6 +203,7 @@ static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
 
   if (ptr->root->poll_timeout == 0) // Mimic 0 causes timeout behavior (not all platforms do this)
   {
+    ptr->io_wait_count.timeouts++;
     return memcached_set_error(*ptr, MEMCACHED_TIMEOUT, MEMCACHED_AT);
   }
 
@@ -340,8 +341,6 @@ static bool io_flush(memcached_server_write_instance_st ptr,
           }
           else if (rc == MEMCACHED_TIMEOUT)
           {
-            ptr->io_wait_count.timeouts++;
-            error= memcached_set_error(*ptr, MEMCACHED_TIMEOUT, MEMCACHED_AT);
             return false;
           }