bk commit into 5.0 tree (jonas:1.2034)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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.2034 05/09/30 12:27:39 jonas@stripped +2 -0
  Merge joreland@stripped:/home/bk/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  ndb/src/mgmsrv/MgmtSrvrConfig.cpp
    1.8 05/09/30 12:27:35 jonas@stripped +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.89 05/09/30 12:27:35 jonas@stripped +0 -0
    Auto merged

# 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/mysql-5.0-push/RESYNC

--- 1.88/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-09-29 09:48:45 +02:00
+++ 1.89/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-09-30 12:27:35 +02:00
@@ -393,8 +393,6 @@
   m_newConfig = NULL;
   if (config_filename)
     m_configFilename.assign(config_filename);
-  else
-    m_configFilename.assign("config.ini");
 
   m_nextConfigGenerationNumber = 0;
 
@@ -429,7 +427,7 @@
     _config= readConfig();
     if (_config == 0) {
       ndbout << "Unable to read config file" << endl;
-      require(false);
+      exit(-1);
     }
   }
 

--- 1.7/ndb/src/mgmsrv/MgmtSrvrConfig.cpp	2005-09-20 09:34:43 +02:00
+++ 1.8/ndb/src/mgmsrv/MgmtSrvrConfig.cpp	2005-09-30 12:27:35 +02:00
@@ -52,7 +52,15 @@
 MgmtSrvr::readConfig() {
   Config *conf;
   InitConfigFileParser parser;
-  conf = parser.parseConfig(m_configFilename.c_str());
+  if (m_configFilename.length())
+  {
+    conf = parser.parseConfig(m_configFilename.c_str());
+  }
+  else 
+  {
+    ndbout_c("Reading cluster configuration using my.cnf");
+    conf = parser.parse_mycnf();
+  }
   return conf;
 }