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

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents b1d5f861 51fc14dd
...@@ -13778,17 +13778,11 @@ void Dblqh::execSTART_FRAGREQ(Signal* signal) ...@@ -13778,17 +13778,11 @@ void Dblqh::execSTART_FRAGREQ(Signal* signal)
c_lcp_complete_fragments.add(fragptr); c_lcp_complete_fragments.add(fragptr);
if(lcpNo == ZNIL) if(lcpNo == ZNIL)
{
for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)
{
if (tabptr.p->fragrec[i] != RNIL)
{ {
signal->theData[0] = tabptr.i; signal->theData[0] = tabptr.i;
signal->theData[1] = tabptr.p->fragid[i]; signal->theData[1] = fragId;
sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB); sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);
} }
}
}
return; return;
}//if }//if
...@@ -13854,21 +13848,17 @@ void Dblqh::execRESTORE_LCP_CONF(Signal* signal) ...@@ -13854,21 +13848,17 @@ void Dblqh::execRESTORE_LCP_CONF(Signal* signal)
*/ */
tabptr.i = fragptr.p->tabRef; tabptr.i = fragptr.p->tabRef;
ptrCheckGuard(tabptr, ctabrecFileSize, tablerec); ptrCheckGuard(tabptr, ctabrecFileSize, tablerec);
for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)
{ signal->theData[0] = fragptr.p->tabRef;
if (tabptr.p->fragrec[i] != RNIL) signal->theData[1] = fragptr.p->fragId;
{
signal->theData[0] = tabptr.i;
signal->theData[1] = tabptr.p->fragid[i];
sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB); sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);
}
}
if (!c_lcp_waiting_fragments.isEmpty()) if (!c_lcp_waiting_fragments.isEmpty())
{ {
send_restore_lcp(signal); send_restore_lcp(signal);
return; return;
} }
if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == ZTRUE) if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == ZTRUE)
{ {
jam(); jam();
......
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