bk commit into 5.0 tree (root:1.2244)

[jhe]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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, 2006-08-10 16:13:25+08:00, root@stripped +2 -0
  Just improve the error information, so that normal uses also can understand what's wrong.

  ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2006-08-10 16:10:27+08:00, root@stripped +5 -5
    display directly about the reason of the error, and show the alias name of one of (MGM, API, DB);

  ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2006-08-10 16:10:41+08:00, root@stripped +4 -1
    If config_filename is configured, show its fullname.

# 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:	root
# Host:	qa3-104.qa.cn.tlan
# Root:	/mnt/sda7/hejun/mysql/bug20848_5.0

--- 1.79/ndb/src/mgmsrv/ConfigInfo.cpp	2006-08-10 16:13:39 +08:00
+++ 1.80/ndb/src/mgmsrv/ConfigInfo.cpp	2006-08-10 16:13:39 +08:00
@@ -3325,10 +3325,10 @@
 
   Uint64 newVal = (Uint64)((Int64)oldVal * mul + add);
   if(!ctx.m_info->verify(ctx.m_currentInfo, newName, newVal)){
-    ctx.reportError("Unable to handle deprication, new value not within bounds"
-		    "%s %s - [%s] starting at line: %d",
+    ctx.reportError("too many nodes are configured, new value not within bounds, "
+		    "%s %s - [%s] configuration at line: %d",
 		    oldName, newName,
-		    ctx.fname, ctx.m_sectionLineno);
+		     ConfigInfo::nameToAlias(ctx.fname), ctx.m_sectionLineno);
     return false;
   }
 
@@ -3495,11 +3495,11 @@
   Uint32 mgm_nodes = 0;
   Uint32 api_nodes = 0;
   if (!ctx.m_userProperties.get("DB", &db_nodes)) {
-    ctx.reportError("At least one database node should be defined in config file");
+    ctx.reportError("At least one database node (for the ndbd) should be defined in config file");
     return false;
   }
   if (!ctx.m_userProperties.get("MGM", &mgm_nodes)) {
-    ctx.reportError("At least one management server node should be defined in config file");
+    ctx.reportError("At least one management server node (for the ndb_mgmd) should be defined in config file");
     return false;
   }
   if (!ctx.m_userProperties.get("API", &api_nodes)) {

--- 1.102/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-08-10 16:13:40 +08:00
+++ 1.103/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-08-10 16:13:40 +08:00
@@ -450,7 +450,10 @@
     // read config locally
     _config= readConfig();
     if (_config == 0) {
-      ndbout << "Unable to read config file" << endl;
+      if (config_filename != NULL)
+        ndbout << "Invalid configuration file: " << config_filename << endl;
+      else
+        ndbout << "Invalid configuration file" << endl;
       exit(-1);
     }
   }