Commit 34aa77dd authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
parents cb8084d4 0f593995
......@@ -653,7 +653,6 @@ void Qmgr::execCM_REGREQ(Signal* signal)
jam();
c_start.m_president_candidate = addNodePtr.i;
c_start.m_president_candidate_gci = gci;
ndbout_c("assign candidate: %u %u", addNodePtr.i, gci);
}
sendCmRegrefLab(signal, Tblockref, CmRegRef::ZELECTION);
return;
......@@ -1106,7 +1105,6 @@ void Qmgr::execCM_REGREF(Signal* signal)
signal->theData[3] = 2;
c_start.m_president_candidate = candidate;
c_start.m_president_candidate_gci = candidate_gci;
ndbout_c("assign candidate: %u %u", candidate, candidate_gci);
} else {
signal->theData[3] = 4;
}//if
......@@ -1409,7 +1407,6 @@ void Qmgr::regreqTimeLimitLab(Signal* signal)
{
jam();
c_start.m_president_candidate = getOwnNodeId();
ndbout_c("Assigning candidate to self: %d", getOwnNodeId());
}
cmInfoconf010Lab(signal);
......
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