diff options
Diffstat (limited to 'dev-libs/libmemcached/files/continuum-1.0.18.patch')
-rw-r--r-- | dev-libs/libmemcached/files/continuum-1.0.18.patch | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/dev-libs/libmemcached/files/continuum-1.0.18.patch b/dev-libs/libmemcached/files/continuum-1.0.18.patch index 296978044311..17a8afd7ff98 100644 --- a/dev-libs/libmemcached/files/continuum-1.0.18.patch +++ b/dev-libs/libmemcached/files/continuum-1.0.18.patch @@ -1,7 +1,5 @@ -diff --git libmemcached/memcached.cc libmemcached/memcached.cc -index 337f918..6e88c25 100644 ---- libmemcached/memcached.cc -+++ libmemcached/memcached.cc +--- a/libmemcached/memcached.cc ++++ b/libmemcached/memcached.cc @@ -285,6 +285,8 @@ void memcached_servers_reset(memcached_st *shell) { libmemcached_free(self, self->ketama.continuum); @@ -11,10 +9,8 @@ index 337f918..6e88c25 100644 memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts); memcached_instance_set(self, NULL, 0); -diff --git tests/libmemcached-1.0/all_tests.h tests/libmemcached-1.0/all_tests.h -index b4abe9d..f89f007 100644 ---- tests/libmemcached-1.0/all_tests.h -+++ tests/libmemcached-1.0/all_tests.h +--- a/tests/libmemcached-1.0/all_tests.h ++++ b/tests/libmemcached-1.0/all_tests.h @@ -452,6 +452,7 @@ collection_st collection[] ={ {"hsieh_availability", 0, 0, hsieh_availability}, {"murmur_availability", 0, 0, murmur_availability}, @@ -23,10 +19,8 @@ index b4abe9d..f89f007 100644 {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS}, {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS}, {"block", 0, 0, tests}, -diff --git tests/libmemcached-1.0/setup_and_teardowns.cc tests/libmemcached-1.0/setup_and_teardowns.cc -index 4191c38..eb29128 100644 ---- tests/libmemcached-1.0/setup_and_teardowns.cc -+++ tests/libmemcached-1.0/setup_and_teardowns.cc +--- a/tests/libmemcached-1.0/setup_and_teardowns.cc ++++ b/tests/libmemcached-1.0/setup_and_teardowns.cc @@ -177,6 +177,16 @@ test_return_t memcached_servers_reset_SETUP(memcached_st *memc) return TEST_SUCCESS; } @@ -44,10 +38,8 @@ index 4191c38..eb29128 100644 test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc) { test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc)); -diff --git tests/libmemcached-1.0/setup_and_teardowns.h tests/libmemcached-1.0/setup_and_teardowns.h -index 7610c5a..59b56f6 100644 ---- tests/libmemcached-1.0/setup_and_teardowns.h -+++ tests/libmemcached-1.0/setup_and_teardowns.h +--- a/tests/libmemcached-1.0/setup_and_teardowns.h ++++ b/tests/libmemcached-1.0/setup_and_teardowns.h @@ -64,3 +64,4 @@ test_return_t pre_buffer(memcached_st*); test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc); test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP(memcached_st *memc); |