X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finitialize_query.cc;h=dca3c4d8276cc0c33c188f663571c5ad0a106812;hb=8da5675f446c52fa0410edeb8d94ad18201b004b;hp=5950158b053feb22a6205ef825719d08277d04a3;hpb=afddcf83538afc8300886702fcddf2333eb94c1f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index 5950158b..dca3c4d8 100644
--- a/libmemcached/initialize_query.cc
+++ b/libmemcached/initialize_query.cc
@@ -36,14 +36,17 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t initialize_query(memcached_st *self)
+memcached_return_t initialize_query(memcached_st *self, bool increment_query_id)
 {
   if (self == NULL)
   {
     return MEMCACHED_INVALID_ARGUMENTS;
   }
 
-  self->query_id++;
+  if (increment_query_id)
+  {
+    self->query_id++;
+  }
 
   if (self->state.is_time_for_rebuild)
   {
@@ -55,12 +58,14 @@ memcached_return_t initialize_query(memcached_st *self)
     return memcached_set_error(*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT);
   }
 
+  memcached_error_free(*self);
+
   return MEMCACHED_SUCCESS;
 }
 
 memcached_return_t initialize_const_query(const memcached_st *self)
 {
-  if (not self)
+  if (self == NULL)
   {
     return MEMCACHED_INVALID_ARGUMENTS;
   }