Abstraction (which will save us merge hell with 1.2).

[awesomized/libmemcached] / libmemcached / initialize_query.cc

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index 84fc2290e647d8f3913d2e58915f59b735bdd043..cef8e575f10f62e101d3d16c466ed0cd2980f2a6 100644 (file)
--- 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 *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,11 +59,12 @@ memcached_return_t initialize_query(memcached_st *self)
   }
 
   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 (self == NULL)
   {