bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4914 to 4915)

[magnus.blaudd]

 4915 magnus.blaudd@stripped	2012-04-16
      ndb
       - make ndb_config --configinfo --xml print the allowed values
         to set for config variables of enum type

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4914 magnus.blaudd@stripped	2012-04-13
      ndb
       - remove unnecessary ifdef, all versions have OPTION_ALLOW_BATCH now

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-03-09 13:24:50 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-04-16 10:30:41 +0000
@@ -3955,7 +3955,8 @@ public:
     pairs.put("name", param_name);
     pairs.put("comment", info.getDescription(section, param_name));
 
-    switch (info.getType(section, param_name)) {
+    const ConfigInfo::Type param_type = info.getType(section, param_name);
+    switch (param_type) {
     case ConfigInfo::CI_BOOL:
       pairs.put("type", "bool");
 
@@ -3996,6 +3997,13 @@ public:
         pairs.put("mandatory", "true");
       else if (info.hasDefault(section, param_name))
         pairs.put("default", info.getDefaultString(section, param_name));
+
+      if (param_type == ConfigInfo::CI_ENUM)
+      {
+        // Concatenate the allowed enum values to a space separated string
+        info.get_enum_values(section, param_name, buf);
+        require(pairs.put("allowed_values", buf.c_str()));
+      }
       break;
 
     case ConfigInfo::CI_SECTION:

No bundle (reason: useless for push emails).