From: John David Duncan Date: September 22 2011 7:44am Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3526 to 3527) List-Archive: http://lists.mysql.com/commits/141076 Message-Id: <201109220745.p8M7j5la031940@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3527 John David Duncan 2011-09-22 merge modified: storage/ndb/memcache/src/ClusterConnectionPool.cc 3526 John David Duncan 2011-09-21 bundled memcached -- fix type in CMakeLists.txt modified: storage/ndb/memcache/extra/memcached/CMakeLists.txt === modified file 'storage/ndb/memcache/src/ClusterConnectionPool.cc' --- a/storage/ndb/memcache/src/ClusterConnectionPool.cc 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/src/ClusterConnectionPool.cc 2011-09-22 07:42:11 +0000 @@ -52,7 +52,7 @@ ClusterConnectionPool *get_connection_po } -bool store_connection_pool_for_cluster(const char *name, +void store_connection_pool_for_cluster(const char *name, const ClusterConnectionPool *p) { DEBUG_ENTER(); if(name == 0) name = "[default]"; No bundle (reason: useless for push emails).