summaryrefslogtreecommitdiff
path: root/ndb/src/kernel/main.cpp
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-03-01 19:53:57 +1100
committerunknown <stewart@mysql.com>2005-03-01 19:53:57 +1100
commit65be842f791570c5c431108d7618940565cc0049 (patch)
treea94ebc3cee96695bd65c52d01c6698e594249501 /ndb/src/kernel/main.cpp
parent09b7d18a60077a16240fc5298e0068d3db243521 (diff)
downloadmariadb-git-65be842f791570c5c431108d7618940565cc0049.tar.gz
Fixes from Tomas's review of 'use configuration mgm handle as a transporter'.
This should help with the PURGE STALE SESSIONS problem. ndb/src/common/transporter/TransporterRegistry.cpp: No longer need to do funny connecting and port reporting in start_service as we convert the configuration mgm after we have bound to the ports we have to report. use a BaseString for constructing the connect string. ndb/src/kernel/main.cpp: Reuse the mgm handle used to fetch configuration as a transporter connection. ndb/src/kernel/vm/Configuration.cpp: m_mgmd_host is now a BaseString. ndb/src/kernel/vm/Configuration.hpp: use BaseString for m_mgmd_host
Diffstat (limited to 'ndb/src/kernel/main.cpp')
-rw-r--r--ndb/src/kernel/main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/ndb/src/kernel/main.cpp b/ndb/src/kernel/main.cpp
index c156a26500c..bd15ef37e20 100644
--- a/ndb/src/kernel/main.cpp
+++ b/ndb/src/kernel/main.cpp
@@ -190,6 +190,13 @@ int main(int argc, char** argv)
exit(-1);
}
+ // Re-use the mgm handle as a transporter
+ if(!globalTransporterRegistry.connect_client(
+ theConfig->get_config_retriever()->get_mgmHandlePtr()))
+ ERROR_SET(fatal, ERR_INVALID_CONFIG,
+ "Connection to mgmd terminated before setup was complete",
+ "StopOnError missing");
+
if (!globalTransporterRegistry.start_clients()){
ndbout_c("globalTransporterRegistry.start_clients() failed");
exit(-1);