Commit 94693e77 authored by magnus@neptunus.(none)'s avatar magnus@neptunus.(none)

Merge msvensson@build.mysql.com:/home/bk/mysql-4.1

into neptunus.(none):/home/magnus/mysql/mysql-4.1
parents 4230eae8 713c80d2
...@@ -29,24 +29,31 @@ ...@@ -29,24 +29,31 @@
void void
Ndb::checkFailedNode() Ndb::checkFailedNode()
{ {
for (NodeId i = 0; i < theNoOfDBnodes; i ++){ DBUG_ENTER("Ndb::checkFailedNode");
DBUG_PRINT("enter", ("theNoOfDBnodes: %d", theNoOfDBnodes));
DBUG_ASSERT(theNoOfDBnodes < MAX_NDB_NODES);
for (int i = 0; i < theNoOfDBnodes; i++){
const NodeId node_id = theDBnodes[i]; const NodeId node_id = theDBnodes[i];
DBUG_PRINT("info", ("i: %d, node_id: %d", i, node_id));
NdbConnection * tNdbCon = theConnectionArray[node_id]; DBUG_ASSERT(node_id < MAX_NDB_NODES);
if (the_release_ind[node_id] == 1){ if (the_release_ind[node_id] == 1){
/** /**
* Release all connections in idle list (for node) * Release all connections in idle list (for node)
*/ */
NdbConnection * tNdbCon = theConnectionArray[node_id];
theConnectionArray[node_id] = NULL; theConnectionArray[node_id] = NULL;
while (tNdbCon != NULL) { while (tNdbCon != NULL) {
NdbConnection* tempNdbCon = tNdbCon; NdbConnection* tempNdbCon = tNdbCon;
tNdbCon = tNdbCon->next(); tNdbCon = tNdbCon->next();
releaseNdbCon(tempNdbCon); releaseNdbCon(tempNdbCon);
}//while }
the_release_ind[node_id] = 0; the_release_ind[node_id] = 0;
}//if }
}//for }
DBUG_VOID_RETURN;
} }
#if 0 #if 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment