X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finitialize_query.cc;h=cef8e575f10f62e101d3d16c466ed0cd2980f2a6;hb=88b1aa19c0b3c5ad047222618cb17f447ea2bc67;hp=31a15fbccc4f9d0d4ab994edd3217dbeab880970;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=awesomized%2Flibmemcached

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index 31a15fbc..cef8e575 100644
--- a/libmemcached/initialize_query.cc
+++ b/libmemcached/initialize_query.cc
@@ -36,12 +36,17 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t initialize_query(memcached_st *self)
+memcached_return_t initialize_query(Memcached *self, bool increment_query_id)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
-  self->query_id++;
+  if (increment_query_id)
+  {
+    self->query_id++;
+  }
 
   if (self->state.is_time_for_rebuild)
   {
@@ -50,16 +55,21 @@ memcached_return_t initialize_query(memcached_st *self)
 
   if (memcached_server_count(self) == 0)
   {
-    return memcached_set_error(self, MEMCACHED_NO_SERVERS, NULL);
+    return memcached_set_error(*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT);
   }
 
+  memcached_error_free(*self);
+  memcached_result_reset(&self->result);
+
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return_t initialize_const_query(const memcached_st *self)
+memcached_return_t initialize_const_query(const Memcached *self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   if (memcached_server_count(self) == 0)
   {