bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3144) Bug#47365

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3-bug47365/ based on revid:magnus.blaudd@stripped28-u72djdsaqgw00qs7

 3144 Magnus Blåudd	2009-11-03
      Bug#47365 ndb_config --xml --configinfo: mark shm*, sci* as unsupported
       - Extend status for a config parameter so it can now also have the status experimental
       - Mark all SCI and SHM parameters as experimental

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.hpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-10-09 13:09:38 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-11-03 10:48:51 +0000
@@ -2191,7 +2191,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SHM",
     "SHM",
     "Connection section",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_SECTION,
     (const char *)CONNECTION_TYPE_SHM, 
@@ -2236,7 +2236,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Signum",
     "SHM",
     "Signum to be used for signalling",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     UNDEFINED,
@@ -2248,7 +2248,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId1",
     "SHM",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2259,7 +2259,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId2",
     "SHM",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2270,7 +2270,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Group",
     "SHM",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "35",
@@ -2281,7 +2281,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeIdServer",
     "SHM",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2292,7 +2292,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendSignalId",
     "SHM",
     "Sends id in each signal.  Used in trace files.",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "false",
@@ -2305,7 +2305,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Checksum",
     "SHM",
     "If checksum is enabled, all signals between nodes are checked for errors",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "true",
@@ -2317,7 +2317,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "ShmKey",
     "SHM",
     "A shared memory key",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     UNDEFINED,
@@ -2329,7 +2329,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "ShmSize",
     "SHM",
     "Size of shared memory segment",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "1M",
@@ -2366,7 +2366,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SCI",
     "SCI",
     "Connection section",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_SECTION,
     (const char *)CONNECTION_TYPE_SCI, 
@@ -2378,7 +2378,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId1",
     "SCI",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2390,7 +2390,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId2",
     "SCI",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2402,7 +2402,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Group",
     "SCI",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "15",
@@ -2413,7 +2413,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeIdServer",
     "SCI",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2458,7 +2458,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host1SciId0",
     "SCI",
     "SCI-node id for adapter 0 on Host1 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2470,7 +2470,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host1SciId1",
     "SCI",
     "SCI-node id for adapter 1 on Host1 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "0",
@@ -2482,7 +2482,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host2SciId0",
     "SCI",
     "SCI-node id for adapter 0 on Host2 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2494,7 +2494,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host2SciId1",
     "SCI",
     "SCI-node id for adapter 1 on Host2 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "0",
@@ -2506,7 +2506,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendSignalId",
     "SCI",
     "Sends id in each signal.  Used in trace files.",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "true",
@@ -2518,7 +2518,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Checksum",
     "SCI",
     "If checksum is enabled, all signals between nodes are checked for errors",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "false",
@@ -2530,7 +2530,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendLimit",
     "SCI",
     "Transporter send buffer contents are sent when this no of bytes is buffered",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "8K",
@@ -2542,7 +2542,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SharedBufferSize",
     "SCI",
     "Size of shared memory segment",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "1M",
@@ -2570,6 +2570,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     ConfigInfo::CI_STRING,
     UNDEFINED,
     0, 0 }
+
 };
 
 const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
@@ -2617,7 +2618,14 @@ ConfigInfo::ConfigInfo()
     pinfo.put("Description", param._description);
     pinfo.put("Flags",       param._flags);
     pinfo.put("Type",        param._type);
-    pinfo.put("Status",      param._status);
+
+    const Status status = param._status;
+    require(status == CI_USED ||
+            status == CI_EXPERIMENTAL ||
+            status == CI_DEPRICATED ||
+            status == CI_NOTIMPLEMENTED ||
+            status == CI_INTERNAL);
+    pinfo.put("Status", status);
 
     switch (param._type) {
       case CI_BOOL:
@@ -3142,6 +3150,16 @@ public:
     if (buf.length())
       pairs.put("check", buf.c_str());
 
+    // Get "supported" flag
+    Uint32 status = info.getStatus(section, param_name);
+    buf.clear();
+    if (status & ConfigInfo::CI_EXPERIMENTAL)
+      buf.append("experimental");
+
+    if (buf.length())
+      pairs.put("supported", buf.c_str());
+
+
     print_xml("param", pairs);
   }
 };

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.hpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2009-11-03 10:48:51 +0000
@@ -47,9 +47,10 @@ class ConfigInfo {
 public:
   enum Type        { CI_BOOL, CI_INT, CI_INT64, CI_STRING, CI_SECTION };
   enum Status      { CI_USED,            ///< Active
-		     CI_DEPRICATED,      ///< Can be, but shouldn't
-		     CI_NOTIMPLEMENTED,  ///< Is ignored.
-		     CI_INTERNAL         ///< Not configurable by the user
+                     CI_EXPERIMENTAL,    ///< Active but experimental
+                     CI_DEPRICATED,      ///< Can be used, but shouldn't
+                     CI_NOTIMPLEMENTED,  ///< Is ignored.
+                     CI_INTERNAL         ///< Not configurable by the user
   };
 
   enum Flags {

Attachment: [text/bzr-bundle] bzr/[e-mail]