1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
jonas@perch.ndb.mysql.com 2007-03-14 11:23:58 +01:00
commit f2465cf677
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/ndb/src/kernel/blocks/suma/Suma.cpp
View File

@ -578,6 +578,18 @@ void Suma::execAPI_FAILREQ(Signal* signal)
return; return;
} }
if (c_failedApiNodes.get(failedApiNode))
{
jam();
return;
}
if (!c_subscriber_nodes.get(failedApiNode))
{
jam();
return;
}
c_failedApiNodes.set(failedApiNode); c_failedApiNodes.set(failedApiNode);
c_connected_nodes.clear(failedApiNode); c_connected_nodes.clear(failedApiNode);
bool found = removeSubscribersOnNode(signal, failedApiNode); bool found = removeSubscribersOnNode(signal, failedApiNode);
@ -591,9 +603,12 @@ void Suma::execAPI_FAILREQ(Signal* signal)
Ptr<Gcp_record> gcp; Ptr<Gcp_record> gcp;
for(c_gcp_list.first(gcp); !gcp.isNull(); c_gcp_list.next(gcp)) for(c_gcp_list.first(gcp); !gcp.isNull(); c_gcp_list.next(gcp))
{ {
jam();
ack->rep.gci = gcp.p->m_gci; ack->rep.gci = gcp.p->m_gci;
if(gcp.p->m_subscribers.get(failedApiNode)) if(gcp.p->m_subscribers.get(failedApiNode))
{ {
jam();
gcp.p->m_subscribers.clear(failedApiNode);
ack->rep.senderRef = numberToRef(0, failedApiNode); ack->rep.senderRef = numberToRef(0, failedApiNode);
sendSignal(SUMA_REF, GSN_SUB_GCP_COMPLETE_ACK, signal, sendSignal(SUMA_REF, GSN_SUB_GCP_COMPLETE_ACK, signal,
SubGcpCompleteAck::SignalLength, JBB); SubGcpCompleteAck::SignalLength, JBB);