bzr push into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4535 to 4536)

[Maitrayi Sabaratnam]

 4536 Maitrayi Sabaratnam	2011-09-19
      Bug 11766870 - 60097: NDB_CONFIG TO DUMP CONFIG VERSION FOR DATA NODES-Testfix

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/test/ndbapi/testMgm.cpp
 4535 Jonas Oreland	2011-09-19
      ndb index stat - use variable together with condition-variable, so that pthread_signal "doesn't get lost"

    modified:
      sql/ha_ndb_index_stat.cc
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-09-14 12:22:49 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-09-19 14:10:19 +0000
@@ -735,12 +735,6 @@ MgmtSrvr::get_packed_config_from_node(No
     DBUG_RETURN(false);
   }
 
-  if (nodeId == getOwnNodeId())
-  {
-    DBUG_RETURN(m_config_manager->get_packed_config(NDB_MGM_NODE_TYPE_API,
-                                                    &buf64, error));
-  }
-
   if (getNodeType(nodeId) != NDB_MGM_NODE_TYPE_NDB)
   {
     error.assfmt("Node %d is not a data node. ", nodeId);

=== modified file 'storage/ndb/test/ndbapi/testMgm.cpp'
--- a/storage/ndb/test/ndbapi/testMgm.cpp	2011-09-13 08:58:27 +0000
+++ b/storage/ndb/test/ndbapi/testMgm.cpp	2011-09-19 14:10:19 +0000
@@ -811,13 +811,16 @@ check_get_config_illegal_node(NdbMgmd& m
 static bool
 check_get_config_wrong_type(NdbMgmd& mgmd)
 {
+  int myChoice = myRandom48(2);
+  ndb_mgm_node_type randomAllowedType = (myChoice) ?
+                                        NDB_MGM_NODE_TYPE_API :
+                                        NDB_MGM_NODE_TYPE_MGM;
   int nodeId = 0;
-
-  if (get_nodeid_of_type(mgmd, NDB_MGM_NODE_TYPE_API, &nodeId))
+  if (get_nodeid_of_type(mgmd, randomAllowedType, &nodeId))
   {
     return get_config_from_illegal_node(mgmd, nodeId);
   }
-  // No API nodes found.
+  // No API/MGM nodes found.
   return true;
 }
 
@@ -842,15 +845,10 @@ int runGetConfigFromNode(NDBT_Context* c
   int loops= ctx->getNumLoops();
   for (int l= 0; l < loops; l++)
   {
-    /* Get config from a node of type:
-     * NDB_MGM_NODE_TYPE_NDB or NDB_MGM_NODE_TYPE_MGM
+    /* Get config from a node of type: * NDB_MGM_NODE_TYPE_NDB
      */
-    int myChoice = myRandom48(2);
-    ndb_mgm_node_type randomAllowedType = (myChoice) ?
-                                          NDB_MGM_NODE_TYPE_NDB :
-                                          NDB_MGM_NODE_TYPE_MGM;
     int nodeId = 0;
-    if (get_nodeid_of_type(mgmd, randomAllowedType, &nodeId))
+    if (get_nodeid_of_type(mgmd,  NDB_MGM_NODE_TYPE_NDB, &nodeId))
     {
       struct ndb_mgm_configuration* conf =
         ndb_mgm_get_configuration_from_node(mgmd.handle(), nodeId);

No bundle (reason: useless for push emails).