bk commit into 5.0 tree (tomas:1.2031)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.2031 05/10/12 15:19:51 tomas@stripped +3 -0
  postt review fixes

  ndb/tools/ndb_config.cpp
    1.12 05/10/12 15:19:41 tomas@stripped +3 -1
    postt review fixes

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.71 05/10/12 15:19:41 tomas@stripped +2 -2
    postt review fixes

  mysql-test/r/ndb_config.result
    1.6 05/10/12 15:19:41 tomas@stripped +0 -1
    postt review fixes

# 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-5.0

--- 1.5/mysql-test/r/ndb_config.result	2005-10-12 14:17:28 +02:00
+++ 1.6/mysql-test/r/ndb_config.result	2005-10-12 15:19:41 +02:00
@@ -6,7 +6,6 @@
 ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7,
 ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,localhost,52428800,52428800 ndbd,4,localhost,52428800,52428800 ndb_mgmd,5,localhost,, mysqld,6,localhost,,
 ndbd,1,localhost ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndb_mgmd,5,localhost mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10,
-Cluster configuration warning line 0: Could not use next node id 2 for section [API], using next unused node id 7.
 ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndb_mgmd,6,localhost mysqld,1, mysqld,7, mysqld,8, mysqld,9, mysqld,10,
 ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndbd,6,localhost ndb_mgmd,1,localhost ndb_mgmd,2,localhost mysqld,11, mysqld,12, mysqld,13, mysqld,14, mysqld,15,
 shm,3,4,35,3 shm,3,5,35,3 shm,3,6,35,3 shm,4,5,35,4 shm,4,6,35,4 shm,5,6,35,5 tcp,11,3,55,3 tcp,11,4,55,4 tcp,11,5,55,5 tcp,11,6,55,6 tcp,12,3,55,3 tcp,12,4,55,4 tcp,12,5,55,5 tcp,12,6,55,6 tcp,13,3,55,3 tcp,13,4,55,4 tcp,13,5,55,5 tcp,13,6,55,6 tcp,14,3,55,3 tcp,14,4,55,4 tcp,14,5,55,5 tcp,14,6,55,6 tcp,15,3,55,3 tcp,15,4,55,4 tcp,15,5,55,5 tcp,15,6,55,6 tcp,1,3,55,1 tcp,1,4,55,1 tcp,1,5,55,1 tcp,1,6,55,1 tcp,2,3,55,2 tcp,2,4,55,2 tcp,2,5,55,2 tcp,2,6,55,2

--- 1.11/ndb/tools/ndb_config.cpp	2005-10-12 14:17:28 +02:00
+++ 1.12/ndb/tools/ndb_config.cpp	2005-10-12 15:19:41 +02:00
@@ -185,7 +185,9 @@
 
   if (g_nodes && g_connections)
   {
-    ndbout_c("Only one option of --nodes and --connections allowed");
+    fprintf(stderr,
+	    "Only one option of --nodes and --connections allowed\n");
+    return -1;
   }
 
   g_section = CFG_SECTION_NODE; //default

--- 1.70/ndb/src/mgmsrv/ConfigInfo.cpp	2005-10-12 14:17:28 +02:00
+++ 1.71/ndb/src/mgmsrv/ConfigInfo.cpp	2005-10-12 15:19:41 +02:00
@@ -2577,9 +2577,9 @@
       id++;
     if (id != nextNodeId)
     {
-      ndbout_c("Cluster configuration warning line %d: "
+      fprintf(stderr,"Cluster configuration warning line %d: "
 	       "Could not use next node id %d for section [%s], "
-	       "using next unused node id %d.",
+	       "using next unused node id %d.\n",
 	       ctx.m_sectionLineno, nextNodeId, ctx.fname, id);
     }
     ctx.m_currentSection->put("NodeId", id);