From: Date: March 29 2007 4:59am
Subject: bk commit into 5.1 tree (Justin.He:1.2487) BUG#24521
List-Archive: http://lists.mysql.com/commits/23230
X-Bug: 24521
Message-Id: <200703290259.l2T2xFOm014219@dev3-240.dev.cn.tlan>

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-03-29 10:59:05+08:00, Justin.He@stripped +3 -0
  Bug#24521, ndbd node crashes if try to create many datafiles for tablespace

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@stripped, 2007-03-29 10:59:02+08:00, Justin.He@stripped +3 -3
    change MaxNoOfOpenFiles's default value to 0, that means no max openning files limitation 
    in ndbfs when user doesnot set explicitly the value in config.ini;
    Meanwhile, if user set a specific value of MaxNoOfOpenFile and hit the max limiation, he 
    deserves the result.

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-03-29 10:59:02+08:00, Justin.He@stripped +1 -1
    change default to 0

  storage/ndb/src/mgmsrv/ParamInfo.cpp@stripped, 2007-03-29 10:59:02+08:00, Justin.He@stripped +1 -1
    change default to 0

# 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/bug24521-5.1-new-ndb-bj

--- 1.4/storage/ndb/src/mgmsrv/ParamInfo.cpp	2007-03-29 10:59:15 +08:00
+++ 1.5/storage/ndb/src/mgmsrv/ParamInfo.cpp	2007-03-29 10:59:15 +08:00
@@ -705,7 +705,7 @@
     CI_USED,
     false,
     CI_INT,
-    "40",
+    "0",
     "20",
     STR_VALUE(MAX_INT_RNIL) },
   

--- 1.101/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-03-29 10:59:15 +08:00
+++ 1.102/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-03-29 10:59:15 +08:00
@@ -879,7 +879,7 @@
     ConfigInfo::CI_USED,
     false,
     ConfigInfo::CI_INT,
-    "40",
+    "0",
     "20",
     STR_VALUE(MAX_INT_RNIL) },
   

--- 1.32/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2007-03-29 10:59:15 +08:00
+++ 1.33/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2007-03-29 10:59:15 +08:00
@@ -105,11 +105,11 @@
 
   theRequestPool = new Pool<Request>;
 
-  m_maxFiles = 40;
+  m_maxFiles = 0;
   ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
   Uint32 noIdleFiles = 27;
   ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &noIdleFiles);
-  if (noIdleFiles > m_maxFiles)
+  if (noIdleFiles > m_maxFiles && m_maxFiles != 0)
     m_maxFiles = noIdleFiles;
   // Create idle AsyncFiles
   for (Uint32 i = 0; i < noIdleFiles; i++){
@@ -650,7 +650,7 @@
 Ndbfs::createAsyncFile(){
 
   // Check limit of open files
-  if (theFiles.size()+1 ==  m_maxFiles) {
+  if (m_maxFiles !=0 && theFiles.size()+1 ==  m_maxFiles) {
     // Print info about all open files
     for (unsigned i = 0; i < theFiles.size(); i++){
       AsyncFile* file = theFiles[i];