bk commit into 4.1 tree (joreland:1.2172)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2172 05/03/10 07:45:17 joreland@stripped +3 -0
  bug#9089
  ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.53 05/03/10 07:45:15 joreland@stripped +2 -3
    Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
    1.14 05/03/10 07:45:15 joreland@stripped +3 -3
    Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.15 05/03/10 07:45:15 joreland@stripped +2 -0
    Reenable MAX_OPEN_FILES to enable LCP in some situations

# 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:	joreland
# Host:	eel.ndb.mysql.com
# Root:	/home/jonas/src/fix

--- 1.14/ndb/include/mgmapi/mgmapi_config_parameters.h	Fri Jan 28 00:42:34 2005
+++ 1.15/ndb/include/mgmapi/mgmapi_config_parameters.h	Thu Mar 10 07:45:15 2005
@@ -81,6 +81,8 @@
 
 #define CFG_DB_BACKUP_DATADIR         158
 
+#define CFG_DB_MAX_OPEN_FILES         159
+
 #define CFG_NODE_ARBIT_RANK           200
 #define CFG_NODE_ARBIT_DELAY          201
 

--- 1.52/ndb/src/mgmsrv/ConfigInfo.cpp	Fri Jan 28 00:42:34 2005
+++ 1.53/ndb/src/mgmsrv/ConfigInfo.cpp	Thu Mar 10 07:45:15 2005
@@ -873,7 +873,7 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    KEY_INTERNAL,
+    CFG_DB_MAX_OPEN_FILES,
     "MaxNoOfOpenFiles",
     DB_TOKEN,
     "Max number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
@@ -882,8 +882,7 @@
     ConfigInfo::CI_INT,
     "40",
     "20",
-    "256" },
-
+    STR_VALUE(MAX_INT_RNIL) },
   
   {
     CFG_DB_TRANSACTION_CHECK_INTERVAL,

--- 1.13/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	Fri Dec 17 10:32:22 2004
+++ 1.14/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	Thu Mar 10 07:45:15 2005
@@ -66,10 +66,10 @@
   ndbrequire(p != 0);
 
   m_maxFiles = 40;
-  //ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
-
+  ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
+  
   // Create idle AsyncFiles
-  Uint32 noIdleFiles = 27;
+  Uint32 noIdleFiles = m_maxFiles > 27  ? 27 : m_maxFiles ;
   for (Uint32 i = 0; i < noIdleFiles; i++){
     theIdleFiles.push_back(createAsyncFile());
   }