database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG#22261 remove global variable global_mgmt_server_check from ClusterMgr

Browse Source 
storage/ndb/src/mgmsrv/main.cpp:
  Remove global variable global_mgmt_server_check
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Change another method to test whether the node is mgmsrv or not
This commit is contained in:
unknown
2006-12-15 17:49:13 +00:00
parent d761a1456f
commit a75003287d
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/ndb/src/mgmsrv/main.cpp
View File

@ -132,8 +132,6 @@ bool g_StopServer;
bool g_RestartServer; bool g_RestartServer;
extern EventLogger g_eventLogger; extern EventLogger g_eventLogger;
extern int global_mgmt_server_check;
enum ndb_mgmd_options { enum ndb_mgmd_options {
OPT_INTERACTIVE = NDB_STD_OPTIONS_LAST, OPT_INTERACTIVE = NDB_STD_OPTIONS_LAST,
OPT_NO_NODEID_CHECKS, OPT_NO_NODEID_CHECKS,
@ -208,8 +206,6 @@ int main(int argc, char** argv)
start: start:
glob= new MgmGlobals; glob= new MgmGlobals;
global_mgmt_server_check = 1;
if (opt_interactive || if (opt_interactive ||
opt_non_interactive || opt_non_interactive ||
g_print_full_config) { g_print_full_config) {

4
storage/ndb/src/ndbapi/ClusterMgr.cpp
View File

@ -361,8 +361,6 @@ ClusterMgr::execAPI_REGREQ(const Uint32 * theData){
theFacade.sendSignalUnCond(&signal, nodeId); theFacade.sendSignalUnCond(&signal, nodeId);
} }
int global_mgmt_server_check = 0; // set to one in mgmtsrvr main;
void void
ClusterMgr::execAPI_REGCONF(const Uint32 * theData){ ClusterMgr::execAPI_REGCONF(const Uint32 * theData){
const ApiRegConf * const apiRegConf = (ApiRegConf *)&theData[0]; const ApiRegConf * const apiRegConf = (ApiRegConf *)&theData[0];
@ -380,7 +378,7 @@ ClusterMgr::execAPI_REGCONF(const Uint32 * theData){
if(node.m_info.m_version != apiRegConf->version){ if(node.m_info.m_version != apiRegConf->version){
node.m_info.m_version = apiRegConf->version; node.m_info.m_version = apiRegConf->version;
if (global_mgmt_server_check == 1) if(theNodes[theFacade.ownId()].m_info.m_type == NodeInfo::MGM)
node.compatible = ndbCompatible_mgmt_ndb(NDB_VERSION, node.compatible = ndbCompatible_mgmt_ndb(NDB_VERSION,
node.m_info.m_version); node.m_info.m_version);
else else