From: Date: September 18 2007 10:42am
Subject: bk commit into 5.1 tree (justin.he:1.2604) BUG#29485
List-Archive: http://lists.mysql.com/commits/34371
X-Bug: 29485
Message-Id: <200709180842.l8I8gwoa009088@TURBO>

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-09-18 08:42:40+00:00, justin.he@stripped +1 -0
  Bug#29485 No output from REPORT MEMORY for non-DN

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-09-18 08:42:26+00:00, justin.he@stripped +18 -0
    check the node's status, if it's not data node, print msg and return 

diff -Nrup a/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-09-12 12:04:58 +00:00
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-09-18 08:42:26 +00:00
@@ -2255,6 +2255,24 @@ CommandInterpreter::executeReport(int pr
 
   if (found >= 0)
   {
+    struct ndb_mgm_cluster_state *cl = ndb_mgm_get_status(m_mgmsrv);
+    if(cl == NULL)
+    {
+      ndbout_c("Cannot get status of node %d.", processId);
+      printError();
+      return -1;
+    }
+    NdbAutoPtr<char> ap1((char*)cl);
+    int i = 0;
+    while((i < cl->no_of_nodes) && cl->node_states[i].node_id != processId)
+      i++;
+    if (processId && 
+        cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB)
+    {
+      ndbout_c("Node %d: is not a data node.", processId);
+      return -1;
+    }
+
     struct st_report_cmd &cmd = report_cmds[found];
     if (cmd.dump_cmd)
     {