From: Date: June 13 2007 8:21pm
Subject: bk commit into 5.0 tree (lzhou:1.2476) BUG#25941
List-Archive: http://lists.mysql.com/commits/28640
X-Bug: 25941
Message-Id: <200706131821.l5DILXEo001248@dev3-63.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.0 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-06-13 18:21:19+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#25941 Output warning messages from stdout to stderr when abitrator warnings exist 

  ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-06-13 18:21:14+00:00, lzhou@dev3-63.(none) +1 -1
    Output warning to stderr when there are abitrator warnings

# 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.0/bug25941

--- 1.86/ndb/src/mgmsrv/ConfigInfo.cpp	2007-06-13 18:21:33 +00:00
+++ 1.87/ndb/src/mgmsrv/ConfigInfo.cpp	2007-06-13 18:21:33 +00:00
@@ -3763,7 +3763,7 @@ check_node_vs_replicas(Vector<ConfigInfo
     if (db_host_count > 1 && node_group_warning.length() > 0)
       ndbout_c("Cluster configuration warning:\n%s",node_group_warning.c_str());
     if (db_host_count > 1 && arbitration_warning.length() > 0)
-      ndbout_c("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
+      ctx.reportError("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
 	       "\n  Running arbitrator on the same host as a database node may"
 	       "\n  cause complete cluster shutdown in case of host failure.");
   }