projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge for release
[m6w6/libmemcached]
/
libmemcached
/
memcached.cc
diff --git
a/libmemcached/memcached.cc
b/libmemcached/memcached.cc
index 5f57c515c3122e9a954294a6371c28631eeaa091..c52873ad3d4fcbccecb86ded6961a9844dc48dcf 100644
(file)
--- a/
libmemcached/memcached.cc
+++ b/
libmemcached/memcached.cc
@@
-59,6
+59,8
@@
static inline bool _memcached_init(memcached_st *self)
self->flags.use_udp= false;
self->flags.verify_key= false;
self->flags.tcp_keepalive= false;
self->flags.use_udp= false;
self->flags.verify_key= false;
self->flags.tcp_keepalive= false;
+ self->flags.is_aes= false;
+ self->flags.is_fetching_version= false;
self->virtual_bucket= NULL;
self->virtual_bucket= NULL;
@@
-75,7
+77,7
@@
static inline bool _memcached_init(memcached_st *self)
self->ketama.continuum_count= 0;
self->ketama.continuum_points_counter= 0;
self->ketama.next_distribution_rebuild= 0;
self->ketama.continuum_count= 0;
self->ketama.continuum_points_counter= 0;
self->ketama.next_distribution_rebuild= 0;
- self->ketama.weighted= false;
+ self->ketama.weighted
_
= false;
self->number_of_hosts= 0;
self->servers= NULL;
self->number_of_hosts= 0;
self->servers= NULL;