bk commit into 5.1 tree (Justin.He:1.2491)

[justin.he]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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@stripped, 2007-04-04 19:30:43+08:00, Justin.He@stripped +1 -0
  sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp

  storage/ndb/src/mgmsrv/ParamInfo.cpp@stripped, 2007-04-04 19:30:40+08:00, Justin.He@stripped +16 -4
    sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/config_info-5.1-new-ndb-bj

--- 1.5/storage/ndb/src/mgmsrv/ParamInfo.cpp	2007-04-04 19:30:52 +08:00
+++ 1.6/storage/ndb/src/mgmsrv/ParamInfo.cpp	2007-04-04 19:30:52 +08:00
@@ -380,10 +380,10 @@
     "If set to yes, then NDB Cluster data will not be swapped out to disk",
     CI_USED,
     true,
-    CI_BOOL,
-    "false",
-    "false",
-    "true" },
+    CI_INT,
+    "0",
+    "1",
+    "2" },
 
   {
     CFG_DB_WATCHDOG_INTERVAL,
@@ -1108,6 +1108,18 @@
     "StringMemory",
     DB_TOKEN,
     "Default size of string memory (0 -> 5% of max 1-100 -> %of max, >100 -> actual bytes)",
+    CI_USED,
+    false,
+    CI_INT,
+    "0",
+    "0",
+    STR_VALUE(MAX_INT_RNIL) },
+
+  { 
+    CFG_DB_MEMREPORT_FREQUENCY,
+    "MemReportFrequency",
+    DB_TOKEN,
+    "Frequency of mem reports in seconds, 0 = only when passing %-limits",
     CI_USED,
     false,
     CI_INT,