bzr commit into mysql-5.1-telco-6.4 branch (tomas.ulin:3238)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.4/

 3238 Tomas Ulin	2009-01-29 [merge]
      merge
modified:
  sql/ha_ndbcluster.cc
  storage/ndb/src/ndbapi/TransporterFacade.hpp

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-01-29 13:57:46 +0000
+++ b/sql/ha_ndbcluster.cc	2009-01-29 16:34:31 +0000
@@ -215,7 +215,10 @@ static int update_status_variables(Thd_n
                             ns->connected_port);
   }
   ns->number_of_replicas= 0;
-  ns->number_of_ready_data_nodes= c->get_no_ready();
+  {
+    int n= c->get_no_ready();
+    ns->number_of_ready_data_nodes= n > 0 ?  n : 0;
+  }
   ns->number_of_data_nodes= c->no_db_nodes();
   ns->connect_count= c->get_connect_count();
   if (thd_ndb)

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.hpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.hpp	2009-01-23 10:10:40 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp	2009-01-29 16:34:31 +0000
@@ -389,8 +389,12 @@ TransporterFacade::getNodeGrp(NodeId n) 
 inline
 bool
 TransporterFacade::get_node_alive(NodeId n) const {
-  const ClusterMgr::Node & node = theClusterMgr->getNodeInfo(n);
-  return node.m_alive;
+  if (theClusterMgr)
+  {
+    const ClusterMgr::Node & node = theClusterMgr->getNodeInfo(n);
+    return node.m_alive;
+  }
+  return 0;
 }
 
 inline