bk commit into 5.1 tree (stewart:1.2180) BUG#20015

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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
  1.2180 06/05/23 14:35:18 stewart@stripped +4 -0
  BUG#20015 mgmsrv and mgmapi: get statport is dead code
  
  Remove unused and obsolete mgmapi functionality (that did nothing anyway).

  storage/ndb/src/mgmsrv/Services.hpp
    1.20 06/05/23 14:35:12 stewart@stripped +0 -1
    remove dead getStatPort

  storage/ndb/src/mgmsrv/Services.cpp
    1.66 06/05/23 14:35:12 stewart@stripped +0 -11
    remove dead 'get statport'

  storage/ndb/src/mgmapi/mgmapi.cpp
    1.64 06/05/23 14:35:12 stewart@stripped +0 -27
    remove ndb_mgm_get_stat_port
    
    was only marked for internal use.
    dead (in 5.0 as well, only removed in 5.1 for safety)

  storage/ndb/include/mgmapi/mgmapi.h
    1.52 06/05/23 14:35:12 stewart@stripped +0 -10
    remove dead internal ndb_mgm_get_stat_port function.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/bug20015

--- 1.51/storage/ndb/include/mgmapi/mgmapi.h	2006-04-27 00:28:26 +10:00
+++ 1.52/storage/ndb/include/mgmapi/mgmapi.h	2006-05-23 14:35:12 +10:00
@@ -849,16 +849,6 @@
 				enum ndb_mgm_event_category category,
 				int level,
 				struct ndb_mgm_reply* reply);
-
-  /**
-   * Returns the port number where statistics information is sent
-   *
-   * @param   handle        NDB management handle.
-   * @param   reply         Reply message.
-   * @return                -1 on error.
-   */
-  int ndb_mgm_get_stat_port(NdbMgmHandle handle,
-			    struct ndb_mgm_reply* reply);
 #endif
 
   /**

--- 1.63/storage/ndb/src/mgmapi/mgmapi.cpp	2006-05-17 08:27:10 +10:00
+++ 1.64/storage/ndb/src/mgmapi/mgmapi.cpp	2006-05-23 14:35:12 +10:00
@@ -1308,33 +1308,6 @@
 
 extern "C"
 int 
-ndb_mgm_get_stat_port(NdbMgmHandle handle, struct ndb_mgm_reply* /*reply*/)
-{
-  SET_ERROR(handle, NDB_MGM_NO_ERROR, "Executing: ndb_mgm_get_stat_port");
-  const ParserRow<ParserDummy> stat_reply[] = {
-    MGM_CMD("error", NULL, ""),
-    MGM_ARG("result", String, Mandatory, "Error message"),
-    MGM_CMD("get statport reply", NULL, ""),
-    MGM_ARG("tcpport", Int, Mandatory, "TCP port for statistics"),
-    MGM_END()
-  };
-  CHECK_HANDLE(handle, -1);
-  CHECK_CONNECTED(handle, -1);
-  
-  Properties args;
-  const Properties *reply;
-  reply = ndb_mgm_call(handle, stat_reply, "get statport", &args);
-  CHECK_REPLY(reply, -1);
-
-  Uint32 port;
-  reply->get("tcpport", &port);
-
-  delete reply;
-  return port;
-}
-
-extern "C"
-int 
 ndb_mgm_dump_state(NdbMgmHandle handle, int nodeId, int* _args,
 		   int _num_args, struct ndb_mgm_reply* /* reply */) 
 {

--- 1.65/storage/ndb/src/mgmsrv/Services.cpp	2006-05-19 18:36:15 +10:00
+++ 1.66/storage/ndb/src/mgmsrv/Services.cpp	2006-05-23 14:35:12 +10:00
@@ -121,8 +121,6 @@
 
 const
 ParserRow<MgmApiSession> commands[] = {
-  MGM_CMD("get statport", &MgmApiSession::getStatPort, ""),
-  
   MGM_CMD("get config", &MgmApiSession::getConfig, ""),
     MGM_ARG("version", Int, Mandatory, "Configuration version number"),
     MGM_ARG("node", Int, Optional, "Node ID"),
@@ -647,15 +645,6 @@
 
   free(tmp_str);
   return;
-}
-
-void
-MgmApiSession::getStatPort(Parser_t::Context &, 
-			   const class Properties &) {
-
-  m_output->println("get statport reply");
-  m_output->println("tcpport: %d", 0);
-  m_output->println("");
 }
 
 void

--- 1.19/storage/ndb/src/mgmsrv/Services.hpp	2006-04-27 00:28:26 +10:00
+++ 1.20/storage/ndb/src/mgmsrv/Services.hpp	2006-05-23 14:35:12 +10:00
@@ -53,7 +53,6 @@
   virtual ~MgmApiSession();
   void runSession();
 
-  void getStatPort(Parser_t::Context &ctx, const class Properties &args);
   void getConfig(Parser_t::Context &ctx, const class Properties &args);
 #ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT
   void getConfig_old(Parser_t::Context &ctx);