bk commit into 5.0 tree (lzhou:1.2259) BUG#22261

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-21 13:28:43+00:00, lzhou@stripped +2 -0
  BUG#22261 remove global variable global_mgmt_server_check from ClusterMgr

  ndb/src/mgmsrv/main.cpp@stripped, 2006-11-21 13:28:41+00:00, lzhou@stripped +0
-4
    Remove global variable global_mgmt_server_check

  ndb/src/ndbapi/ClusterMgr.cpp@stripped, 2006-11-21 13:28:41+00:00,
lzhou@stripped +15 -3
    Change another method to test whether mgmsrv started or not

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lzhou
# Host:	dev3-138.dev.cn.tlan
# Root:	/home/zhl/mysql/mysql-5.0/bug22261

--- 1.47/ndb/src/mgmsrv/main.cpp	2006-11-21 13:28:48 +00:00
+++ 1.48/ndb/src/mgmsrv/main.cpp	2006-11-21 13:28:48 +00:00
@@ -135,8 +135,6 @@
 bool g_RestartServer;
 extern EventLogger g_eventLogger;
 
-extern int global_mgmt_server_check;
-
 enum ndb_mgmd_options {
   OPT_INTERACTIVE = NDB_STD_OPTIONS_LAST,
   OPT_NO_NODEID_CHECKS,
@@ -218,8 +216,6 @@
 #if defined NDB_OSE || defined NDB_SOFTOSE
   efs_segment_share();
 #endif
-
-  global_mgmt_server_check = 1;
 
   if (opt_interactive ||
       opt_non_interactive ||

--- 1.28/ndb/src/ndbapi/ClusterMgr.cpp	2006-11-21 13:28:48 +00:00
+++ 1.29/ndb/src/ndbapi/ClusterMgr.cpp	2006-11-21 13:28:48 +00:00
@@ -375,8 +375,6 @@
   theFacade.sendSignalUnCond(&signal, nodeId);
 }
 
-int global_mgmt_server_check = 0; // set to one in mgmtsrvr main;
-
 void
 ClusterMgr::execAPI_REGCONF(const Uint32 * theData){
   const ApiRegConf * const apiRegConf = (ApiRegConf *)&theData[0];
@@ -394,7 +392,21 @@
 
   if(node.m_info.m_version != apiRegConf->version){
     node.m_info.m_version = apiRegConf->version;
-    if (global_mgmt_server_check == 1)
+    bool mgmt_server_check = false;
+    for(Uint32 i = 0; i < MAX_NODES; i++)
+    {
+      if(!theNodes[i].defined)
+        continue;
+      if(theNodes[i].m_info.m_type == NodeInfo::MGM)
+      {
+	if (theNodes[i].connected == true)
+	{
+	  mgmt_server_check = true;
+	  break; 
+	}
+      }
+    }	
+    if (mgmt_server_check == true)
       node.compatible = ndbCompatible_mgmt_ndb(NDB_VERSION,
 					       node.m_info.m_version);
     else