summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-07-13 15:54:57 +0200
committerunknown <tomas@whalegate.ndb.mysql.com>2007-07-13 15:54:57 +0200
commit0255c9a7ba1de09fa04e4da6ee9a65ac1d767f08 (patch)
treeb10b219432138df084f0ec214e6a322ad8aaf8c6 /storage
parent701dfda11b529643693cc18e23bd48e39e71503b (diff)
parentae23a601aed07617dc1b12bc2d1e320498750ff6 (diff)
downloadmariadb-git-0255c9a7ba1de09fa04e4da6ee9a65ac1d767f08.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb mysql-test/t/disabled.def: Auto merged
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/mgmsrv/ConfigInfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
index 69907224b7f..9cbb7d93ceb 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -3806,16 +3806,16 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections,
}
}
if (db_host_count > 1 && node_group_warning.length() > 0)
- ndbout_c("Cluster configuration warning:\n%s",node_group_warning.c_str());
+ ctx.reportWarning("Cluster configuration warning:\n%s",node_group_warning.c_str());
if (!with_arbitration_rank)
{
- ndbout_c("Cluster configuration warning:"
+ ctx.reportWarning("Cluster configuration warning:"
"\n Neither %s nor %s nodes are configured with arbitrator,"
"\n may cause complete cluster shutdown in case of host failure.",
MGM_TOKEN, API_TOKEN);
}
if (db_host_count > 1 && arbitration_warning.length() > 0)
- ndbout_c("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
+ ctx.reportWarning("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.");
}