Bugfix for memcached_connect() so that it will not always start up servers.

[awesomized/libmemcached] / lib / memcached_get.c

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 38f6865b53a90d440a6771658c4800ad3d91a0f3..c5156439f9dc09166d77f3e414972faa27b1dcfd 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -358,6 +358,8 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
   if (result == NULL)
     result= memcached_result_create(ptr, NULL);
 
+  WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
     if (!ptr->hosts[ptr->cursor_server].cursor_active)
@@ -395,11 +397,10 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
     {
       return result;
     }
-
   }
 
 error:
-  memcached_result_free(result);
+  memcached_string_reset(&result->value);
 
   return NULL;
 }