Commit f3c79286 authored by unknown's avatar unknown

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

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

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