bk commit into 4.1 tree (tulin:1.2346)

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of ndbdev. When ndbdev 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.2346 05/07/19 16:34:56 tulin@stripped +2 -0
  printout of cluster config to use same tokens as documentation

  ndb/src/mgmsrv/ConfigInfo.hpp
    1.9 05/07/19 16:34:54 tulin@stripped +2 -1
    printout of cluster config to use same tokens as documentation

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.58 05/07/19 16:34:54 tulin@stripped +13 -2
    printout of cluster config to use same tokens as documentation

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-4.1

--- 1.57/ndb/src/mgmsrv/ConfigInfo.cpp	Tue Jul 19 15:10:56 2005
+++ 1.58/ndb/src/mgmsrv/ConfigInfo.cpp	Tue Jul 19 16:34:54 2005
@@ -2367,7 +2367,15 @@
 }
 
 const char*
-ConfigInfo::getAlias(const char * section) const {
+ConfigInfo::nameToAlias(const char * name) {
+  for (int i = 0; m_sectionNameAliases[i].name != 0; i++)
+    if(!strcasecmp(name, m_sectionNameAliases[i].name))
+      return m_sectionNameAliases[i].alias;
+  return 0;
+}
+
+const char*
+ConfigInfo::getAlias(const char * section) {
   for (int i = 0; m_sectionNameAliases[i].name != 0; i++)
     if(!strcasecmp(section, m_sectionNameAliases[i].alias))
       return m_sectionNameAliases[i].name;
@@ -3416,7 +3424,10 @@
     }
     
     if (g_print_full_config)
-      printf("[%s]\n", ctx.fname);
+    {
+      const char *alias= ConfigInfo::nameToAlias(ctx.fname);
+      printf("[%s]\n", alias ? alias : ctx.fname);
+    }
 
     Uint32 no = 0;
     ctx.m_userProperties.get("$Section", id, &no);

--- 1.8/ndb/src/mgmsrv/ConfigInfo.hpp	Wed Nov 10 00:13:24 2004
+++ 1.9/ndb/src/mgmsrv/ConfigInfo.hpp	Tue Jul 19 16:34:54 2005
@@ -105,7 +105,8 @@
    *   @note Result is not defined if section/name are wrong!
    */
   bool verify(const Properties* secti, const char* fname, Uint64 value) const;
-  const char* getAlias(const char*) const;
+  static const char* nameToAlias(const char*);
+  static const char* getAlias(const char*);
   bool isSection(const char*) const;
 
   const char*  getDescription(const Properties * sec, const char* fname) const;