summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-07-15 12:35:26 +0200
committerunknown <tomas@poseidon.ndb.mysql.com>2005-07-15 12:35:26 +0200
commit9622c4733dae262f7e97100113ecfcddbc94fd32 (patch)
tree3f670e4614413b14a83110770cb6514c21519bed /ndb
parent22b6dec5ec297386b518a8b1dc8b31a9c9fe8bba (diff)
downloadmariadb-git-9622c4733dae262f7e97100113ecfcddbc94fd32.tar.gz
Bug #11132, reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid
In 4.1 the connection to the management server _must_ stay, that is how we ensure that the nodeids are reserved correctly
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/common/mgmcommon/ConfigRetriever.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/ndb/src/common/mgmcommon/ConfigRetriever.cpp
index 648f3b4a52c..b73bcea1bcc 100644
--- a/ndb/src/common/mgmcommon/ConfigRetriever.cpp
+++ b/ndb/src/common/mgmcommon/ConfigRetriever.cpp
@@ -131,16 +131,14 @@ ConfigRetriever::getConfig() {
}
ndb_mgm_configuration *
-ConfigRetriever::getConfig(NdbMgmHandle m_handle){
-
+ConfigRetriever::getConfig(NdbMgmHandle m_handle)
+{
ndb_mgm_configuration * conf = ndb_mgm_get_configuration(m_handle,m_version);
- if(conf == 0){
+ if(conf == 0)
+ {
setError(CR_ERROR, ndb_mgm_get_latest_error_desc(m_handle));
return 0;
}
-
- ndb_mgm_disconnect(m_handle);
-
return conf;
}