From: Maitrayi Sabaratnam
Date: October 12 2012 9:44am
Subject: bzr push into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4998 to 4999)
 Bug#4671934
List-Archive: http://lists.mysql.com/commits/145024
X-Bug: 4671934
Message-Id: <20121012094448.1659.12785.4999@asator03-z7.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4999 Maitrayi Sabaratnam	2012-10-12
      Bug #4671934 - NDB_CONFIG: DEFAULT VALUES MISSING FOR PARAMETERS

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4998 magnus.blaudd@stripped	2012-10-11
      ndb_mgm
       - Pressing Ctrl-C on certain platforms causes NULL to be returned from
        'readline' and that should trigger a graceful exit of ndb_mgm

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-04-16 10:30:41 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-10-12 08:12:01 +0000
@@ -1155,7 +1155,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     ConfigInfo::CI_USED,
     CI_RESTART_INITIAL,
     ConfigInfo::CI_STRING,
-    0,
+    "sparse",
     0, 0 },
 
   {
@@ -3844,7 +3844,6 @@ public:
         else
           fprintf(m_out, "UNKNOWN\n");
       }
-      fprintf(m_out, "\n");
       break;
 
     case ConfigInfo::CI_INT:
@@ -3860,7 +3859,6 @@ public:
         fprintf(m_out, "(");
       fprintf(m_out, "Min: %llu, ", info.getMin(section, param_name));
       fprintf(m_out, "Max: %llu)\n", info.getMax(section, param_name));
-      fprintf(m_out, "\n");
       break;
 
     case ConfigInfo::CI_BITMASK:
@@ -3873,11 +3871,45 @@ public:
       else if (info.hasDefault(section, param_name))
         fprintf(m_out, "Default: %s\n",
               info.getDefaultString(section, param_name));
-      fprintf(m_out, "\n");
       break;
     case ConfigInfo::CI_SECTION:
-      break;
+      return;
     }
+
+    Uint32 flags = info.getFlags(section, param_name);
+    bool comma = false;
+    bool new_line_needed = false;
+    if (flags & ConfigInfo::CI_CHECK_WRITABLE)
+    {
+      comma= true;
+      new_line_needed = true;
+      fprintf(m_out, "writable");
+    }
+    if (flags & ConfigInfo::CI_RESTART_SYSTEM)
+    {
+      if (comma)
+        fprintf(m_out, ", system");
+      else
+      {
+        comma = true;
+        fprintf(m_out, "system");
+      }
+      new_line_needed = true;
+    }
+    if (flags & ConfigInfo::CI_RESTART_INITIAL)
+    {
+      if (comma)
+        fprintf(m_out, ", initial");
+      else
+      {
+        comma = true;
+        fprintf(m_out, "initial");
+      }
+      new_line_needed = true;
+    }
+    if (new_line_needed)
+      fprintf(m_out, "\n");
+    fprintf(m_out, "\n");
   }
 };
 

No bundle (reason: useless for push emails).