bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3749 to 3750) Bug#13559728

[John David Duncan]

 3750 John David Duncan	2012-01-05
      bug#13559728 -- memcached crashes if only one [API] slot available in config.

    modified:
      storage/ndb/memcache/src/ClusterConnectionPool.cc
 3749 jonas oreland	2012-01-04 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/trpman.cpp
      storage/ndb/src/kernel/blocks/trpman.hpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/kernel/vm/TransporterCallback.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.hpp
=== modified file 'storage/ndb/memcache/src/ClusterConnectionPool.cc'
--- a/storage/ndb/memcache/src/ClusterConnectionPool.cc	2011-12-16 10:04:43 +0000
+++ b/storage/ndb/memcache/src/ClusterConnectionPool.cc	2012-01-06 06:21:07 +0000
@@ -165,7 +165,7 @@ Ndb_cluster_connection * ClusterConnecti
 
   conn = connect(connect_string);
   
-  if(conn->node_id()) {
+  if(conn && conn->node_id()) {
     pool_connections[pool_size++] = conn;
   }
   else {

No bundle (reason: useless for push emails).