bk commit into 4.1 tree (tomas:1.2485) BUG#13611

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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.2485 05/10/10 12:27:48 tomas@stripped +1 -0
    Bug #13611  	 double [TCP DEFAULT] in config.ini crashes ndb_mgmd
    - Added error printout and nice exit for duplicate default sections

  ndb/src/mgmsrv/InitConfigFileParser.cpp
    1.20 05/10/10 12:27:42 tomas@stripped +6 -2
      Bug #13611  	 double [TCP DEFAULT] in config.ini crashes ndb_mgmd
      - Added error printout and nice exit for duplicate default sections

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.19/ndb/src/mgmsrv/InitConfigFileParser.cpp	2005-09-30 11:39:48 +02:00
+++ 1.20/ndb/src/mgmsrv/InitConfigFileParser.cpp	2005-10-10 12:27:42 +02:00
@@ -558,8 +558,12 @@
       }
     }
   }
-  if(ctx.type == InitConfigFileParser::DefaultSection)
-    require(ctx.m_defaults->put(ctx.pname, ctx.m_currentSection));
+  if(ctx.type == InitConfigFileParser::DefaultSection &&
+     !ctx.m_defaults->put(ctx.pname, ctx.m_currentSection))
+  {
+    ctx.reportError("Duplicate default section not allowed");
+    return false;
+  }
   if(ctx.type == InitConfigFileParser::Section)
     require(ctx.m_config->put(ctx.pname, ctx.m_currentSection));
   delete ctx.m_currentSection; ctx.m_currentSection = NULL;