bk commit into 5.1 tree (jonas:1.2202)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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
  1.2202 06/06/26 12:19:29 jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/51-work

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.77 06/06/26 12:19:25 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/vm/SafeCounter.hpp
    1.4 06/06/26 12:19:25 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/vm/RequestTracker.hpp
    1.3 06/06/26 12:19:25 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.60.10.2 06/06/26 12:19:25 jonas@stripped +0 -0
    Merge rename: ndb/src/mgmsrv/ConfigInfo.cpp -> storage/ndb/src/mgmsrv/ConfigInfo.cpp

  storage/ndb/src/kernel/vm/SafeCounter.hpp
    1.1.3.2 06/06/26 12:19:25 jonas@stripped +0 -0
    Merge rename: ndb/src/kernel/vm/SafeCounter.hpp -> storage/ndb/src/kernel/vm/SafeCounter.hpp

  storage/ndb/src/kernel/vm/RequestTracker.hpp
    1.1.1.2 06/06/26 12:19:25 jonas@stripped +0 -0
    Merge rename: ndb/src/kernel/vm/RequestTracker.hpp -> storage/ndb/src/kernel/vm/RequestTracker.hpp

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work/RESYNC

--- 1.60.10.1/ndb/src/mgmsrv/ConfigInfo.cpp	2006-06-26 12:17:34 +02:00
+++ 1.77/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-06-26 12:19:25 +02:00
@@ -762,6 +762,30 @@ const ConfigInfo::ParamInfo ConfigInfo::
     STR_VALUE(MAX_INT_RNIL)},
 
   {
+    CFG_DB_DISK_PAGE_BUFFER_MEMORY,
+    "DiskPageBufferMemory",
+    DB_TOKEN,
+    "Number bytes on each "DB_TOKEN_PRINT" node allocated for disk page buffer cache",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT64,
+    "64M",
+    "4M",
+    "1024G" },
+
+  {
+    CFG_DB_SGA,
+    "SharedGlobalMemory",
+    DB_TOKEN,
+    "Total number bytes on each "DB_TOKEN_PRINT" node allocated for any use",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT64,
+    "20M",
+    "0",
+    "65536G" }, // 32k pages * 32-bit i value
+  
+  {
     CFG_DB_START_PARTIAL_TIMEOUT,
     "StartPartialTimeout",
     DB_TOKEN,
@@ -870,6 +894,18 @@ const ConfigInfo::ParamInfo ConfigInfo::
     STR_VALUE(MAX_INT_RNIL) },
   
   {
+    CFG_DB_INITIAL_OPEN_FILES,
+    "InitialNoOfOpenFiles",
+    DB_TOKEN,
+    "Initial number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "27",
+    "20",
+    STR_VALUE(MAX_INT_RNIL) },
+  
+  {
     CFG_DB_TRANSACTION_CHECK_INTERVAL,
     "TimeBetweenInactiveTransactionAbortCheck",
     DB_TOKEN,
@@ -1215,6 +1251,18 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "2K",
     STR_VALUE(MAX_INT_RNIL) },
 
+  { 
+    CFG_DB_STRING_MEMORY,
+    "StringMemory",
+    DB_TOKEN,
+    "Default size of string memory (0 -> 5% of max 1-100 -> %of max, >100 -> actual bytes)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "0",
+    "0",
+    STR_VALUE(MAX_INT_RNIL) },
+  
   /***************************************************************************
    * API
    ***************************************************************************/