bzr push into mysql-5.1-telco-7.1 branch (maitrayi.sabaratnam:4624 to 4625)

[Maitrayi Sabaratnam]

 4625 Maitrayi Sabaratnam	2012-10-12 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4624 magnus.blaudd@stripped	2012-10-11 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/tools/delete_all.cpp
      storage/ndb/tools/desc.cpp
      storage/ndb/tools/drop_index.cpp
      storage/ndb/tools/drop_tab.cpp
      storage/ndb/tools/listTables.cpp
      storage/ndb/tools/ndb_config.cpp
      storage/ndb/tools/ndbinfo_select_all.cpp
      storage/ndb/tools/restore/restore_main.cpp
      storage/ndb/tools/select_all.cpp
      storage/ndb/tools/select_count.cpp
      storage/ndb/tools/waiter.cpp
=== modified file 'storage/ndb/src/mgmclient/CommandInterpreter.cpp'
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2011-10-21 10:58:09 +0000
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2012-10-12 08:20:49 +0000
@@ -1128,8 +1128,10 @@ CommandInterpreter::execute_impl(const c
   DBUG_PRINT("enter",("line='%s'", _line));
   m_error= 0;
 
-  if(_line == NULL) {
-    ndbout_c("ERROR: Internal error at %s:%d.", __FILE__, __LINE__);
+  if(_line == NULL)
+  {
+    // Pressing Ctrl-C on some platforms will cause 'readline' to
+    // to return NULL, handle it as graceful exit of ndb_mgm 
     m_error = -1;
     DBUG_RETURN(false); // Terminate gracefully
   }

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-04-16 10:33:30 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-10-12 08:20:49 +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).