From: Date: February 15 2007 9:52am
Subject: bk commit into 4.1 tree (gni:1.2607) BUG#21715
List-Archive: http://lists.mysql.com/commits/19927
X-Bug: 21715
Message-Id: <200702150852.l1F8qPsL018320@dev3-221.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
4.1 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, 2007-02-15 16:52:23+08:00, gni@stripped +1 -0
  BUG#21715 mgm client command <id> status return version(0.0.0.0)

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-02-15 16:52:22+08:00, gni@stripped +13 -0
    Adding the judgement for node type to distinguish the data nodes and non-data nodes.
    From the return value. Management client can't distinguish the really not connected
    status for data nodes and status of non-data nodes.
    We can get the connect status about non-data nodes from version, if the version is 0, 
    it means no connected status.

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715

--- 1.52/ndb/src/mgmclient/CommandInterpreter.cpp	2007-02-15 16:52:26 +08:00
+++ 1.53/ndb/src/mgmclient/CommandInterpreter.cpp	2007-02-15 16:52:26 +08:00
@@ -1627,6 +1627,19 @@
     ndbout << processId << ": Node not found" << endl;
     return -1;
   }
+  if (cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB){
+    if (cl->node_states[i].version != 0){
+      version = cl->node_states[i].version;
+      ndbout << "Node "<< cl->node_states[i].node_id <<": connected" ;
+      ndbout_c(" (Version %d.%d.%d)",
+             getMajor(version) ,
+             getMinor(version),
+             getBuild(version));
+
+    }else
+     ndbout << "Node "<< cl->node_states[i].node_id <<": not connected" << endl;
+    return 0;
+  }
   status = cl->node_states[i].node_status;
   startPhase = cl->node_states[i].start_phase;
   version = cl->node_states[i].version;