X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finitialize_query.cc;h=0a4aae075dbafe05d9350a7ac2a81da64f463b18;hb=558dbc482b4285c064b15b7d6889a7e2860c96f2;hp=84fc2290e647d8f3913d2e58915f59b735bdd043;hpb=682c9be93c10b245db9a943459ca6fcde0918138;p=awesomized%2Flibmemcached

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index 84fc2290..0a4aae07 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)
   {
@@ -56,6 +59,7 @@ memcached_return_t initialize_query(memcached_st *self)
   }
 
   memcached_error_free(*self);
+  memcached_result_reset(&self->result);
 
   return MEMCACHED_SUCCESS;
 }