database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-22 19:52:58 +03:00
Code Activity

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575

Browse Source 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
This commit is contained in:
unknown
2006-09-22 19:30:37 +08:00
parent 6647c80f3f 4b08c9faa0
commit 4c64768c40
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View File

@@ -2316,7 +2316,33 @@ Ndbcntr::StopRecord::checkNodeFail(Signal* signal){
{ {
NdbNodeBitmask tmp; NdbNodeBitmask tmp;
tmp.assign(NdbNodeBitmask::Size, stopReq.nodes); tmp.assign(NdbNodeBitmask::Size, stopReq.nodes);
NdbNodeBitmask ndbStopNodes;
ndbStopNodes.assign(NdbNodeBitmask::Size, stopReq.nodes);
ndbStopNodes.bitAND(ndbMask);
ndbStopNodes.copyto(NdbNodeBitmask::Size, stopReq.nodes);
ndbMask.bitANDC(tmp); ndbMask.bitANDC(tmp);
bool allNodesStopped = true;
int i ;
for( i = 0; i< NdbNodeBitmask::Size; i++ ){
if ( stopReq.nodes[i] != 0 ){
allNodesStopped = false;
break;
}
}
if ( allNodesStopped ) {
StopConf * const stopConf = (StopConf *)&signal->theData[0];
stopConf->senderData = stopReq.senderData;
stopConf->nodeState = (Uint32) NodeState::SL_NOTHING;
cntr.sendSignal(stopReq.senderRef, GSN_STOP_CONF, signal,
StopConf::SignalLength, JBB);
stopReq.senderRef = 0;
return false;
}
} }
else else
{ {

2
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View File

@@ -1031,7 +1031,7 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive)
int node_id; int node_id;
if (convert(command_list[pos].c_str(), node_id)) if (convert(command_list[pos].c_str(), node_id))
{ {
if (node_id <= 0) { if (node_id <= 0 || node_id > MAX_NODES) {
ndbout << "Invalid node ID: " << command_list[pos].c_str() ndbout << "Invalid node ID: " << command_list[pos].c_str()
<< "." << endl; << "." << endl;
DBUG_RETURN(true); DBUG_RETURN(true);

5
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@@ -1009,6 +1009,11 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
{ {
nodeId= node_ids[i]; nodeId= node_ids[i];
ndbout << "asked to stop " << nodeId << endl; ndbout << "asked to stop " << nodeId << endl;
if ((getNodeType(nodeId) != NDB_MGM_NODE_TYPE_MGM)
&&(getNodeType(nodeId) != NDB_MGM_NODE_TYPE_NDB))
return WRONG_PROCESS_TYPE;
if (getNodeType(nodeId) != NDB_MGM_NODE_TYPE_MGM) if (getNodeType(nodeId) != NDB_MGM_NODE_TYPE_MGM)
nodes_to_stop.set(nodeId); nodes_to_stop.set(nodeId);
else if (nodeId != getOwnNodeId()) else if (nodeId != getOwnNodeId())