mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
ndb - bug#24331
Make sure LCP scan record is correct initialized
This commit is contained in:
parent
9e0be46731
commit
b455689440
2 changed files with 6 additions and 2 deletions
|
@ -329,6 +329,7 @@ void Dbtup::execREAD_CONFIG_REQ(Signal* signal)
|
|||
|
||||
ScanOpPtr lcp;
|
||||
ndbrequire(c_scanOpPool.seize(lcp));
|
||||
new (lcp.p) ScanOp();
|
||||
c_lcp_scan_op= lcp.i;
|
||||
|
||||
czero = 0;
|
||||
|
|
|
@ -87,6 +87,7 @@ Dbtup::execACC_SCANREQ(Signal* signal)
|
|||
|
||||
ndbrequire(frag.m_lcp_scan_op == c_lcp_scan_op);
|
||||
c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
|
||||
ndbrequire(scanPtr.p->m_fragPtrI == fragPtr.i);
|
||||
bits |= ScanOp::SCAN_LCP;
|
||||
if (tablePtr.p->m_attributes[MM].m_no_of_varsize > 0) {
|
||||
bits |= ScanOp::SCAN_VS;
|
||||
|
@ -1038,6 +1039,7 @@ Dbtup::releaseScanOp(ScanOpPtr& scanPtr)
|
|||
{
|
||||
ndbrequire(fragPtr.p->m_lcp_scan_op == scanPtr.i);
|
||||
fragPtr.p->m_lcp_scan_op = RNIL;
|
||||
scanPtr.p->m_fragPtrI = RNIL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1064,8 +1066,9 @@ Dbtup::execLCP_FRAG_ORD(Signal* signal)
|
|||
frag.m_lcp_scan_op = c_lcp_scan_op;
|
||||
ScanOpPtr scanPtr;
|
||||
c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
|
||||
//ndbrequire(scanPtr.p->m_fragPtrI == fragPtr.i); ?
|
||||
|
||||
ndbrequire(scanPtr.p->m_fragPtrI == RNIL);
|
||||
scanPtr.p->m_fragPtrI = fragPtr.i;
|
||||
|
||||
scanFirst(signal, scanPtr);
|
||||
scanPtr.p->m_state = ScanOp::First;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue