Merge hundin.mysql.fi:/home/heikki/mysql-4.1

into hundin.mysql.fi:/home/heikki/mysql-5.0

innobase/log/log0recv.c

@@ -2608,8 +2608,10 @@ recv_recovery_from_checkpoint_start(
 		a note to the user about it */
 
 		fprintf(stderr,
-	"InnoDB: The log file was created by ibbackup --restore at\n"
+	"InnoDB: The log file was created by ibbackup --apply-log at\n"
 	"InnoDB: %s\n", log_hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP);
+		fprintf(stderr,
+"InnoDB: NOTE: the following crash recovery is part of a normal restore.\n");
 		
 		/* Wipe over the label now */
 

ndb/include/mgmapi/mgmapi_config_parameters.h

@@ -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
 

ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

@@ -66,10 +66,10 @@ Ndbfs::Ndbfs(const Configuration & conf) :
   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());
   }

ndb/src/kernel/blocks/trix/Trix.cpp

@@ -712,7 +712,7 @@ void Trix::setupSubscription(Signal* signal, SubscriptionRecPtr subRecPtr)
   subCreateReq->subscriptionType = SubCreateReq::SingleTableScan;
   
   sendSignal(SUMA_REF, GSN_SUB_CREATE_REQ, 
-	     signal, SubCreateReq::SignalLength, JBB, orderPtr, 1);
+	     signal, SubCreateReq::SignalLength+1, JBB, orderPtr, 1);
 }
 
 void Trix::setupTableScan(Signal* signal, SubscriptionRecPtr subRecPtr)

ndb/src/mgmsrv/ConfigInfo.cpp

@@ -873,7 +873,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     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 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     "40",
     "20",
-    "256" },
-
+    STR_VALUE(MAX_INT_RNIL) },
   
   {
     CFG_DB_TRANSACTION_CHECK_INTERVAL,