projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix packaging issues.
[m6w6/libmemcached]
/
libmemcached
/
initialize_query.cc
diff --git
a/libmemcached/initialize_query.cc
b/libmemcached/initialize_query.cc
index 84fc2290e647d8f3913d2e58915f59b735bdd043..0a4aae075dbafe05d9350a7ac2a81da64f463b18 100644
(file)
--- a/
libmemcached/initialize_query.cc
+++ b/
libmemcached/initialize_query.cc
@@
-36,14
+36,17
@@
#include <libmemcached/common.h>
#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;
}
{
if (self == NULL)
{
return MEMCACHED_INVALID_ARGUMENTS;
}
- self->query_id++;
+ if (increment_query_id)
+ {
+ self->query_id++;
+ }
if (self->state.is_time_for_rebuild)
{
if (self->state.is_time_for_rebuild)
{
@@
-56,6
+59,7
@@
memcached_return_t initialize_query(memcached_st *self)
}
memcached_error_free(*self);
}
memcached_error_free(*self);
+ memcached_result_reset(&self->result);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}