From: Date: March 30 2007 11:47am
Subject: bk commit into 5.1 tree (lzhou:1.2488) BUG#27207
List-Archive: http://lists.mysql.com/commits/23377
X-Bug: 27207
Message-Id: <200703300947.l2U9lWIs009982@dev3-63.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of zhl. When zhl 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-30 09:47:11+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#27207 Return correct error message when ndb_mgmd start with wrong config.ini parameter

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-03-30 09:47:04+00:00, lzhou@dev3-63.(none) +2 -1
    return false when get nodeId fail.

# 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:	lzhou
# Host:	dev3-63.(none)
# Root:	/home/zhl/mysql/mysql-5.1/bug27207

--- 1.102/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-03-30 09:47:31 +00:00
+++ 1.103/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-03-30 09:47:31 +00:00
@@ -2889,7 +2889,8 @@ static bool fixNodeId(InitConfigFilePars
   char buf[] = "NodeIdX";  buf[6] = data[sizeof("NodeI")];
   char sysbuf[] = "SystemX";  sysbuf[6] = data[sizeof("NodeI")];
   const char* nodeId;
-  require(ctx.m_currentSection->get(buf, &nodeId));
+  if(ctx.m_currentSection->get(buf, &nodeId) == false)
+    return false;
 
   char tmpLine[MAX_LINE_LENGTH];
   strncpy(tmpLine, nodeId, MAX_LINE_LENGTH);