Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1f6e703d
Commit
1f6e703d
authored
Aug 29, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wl2025 - bug fixes
1) Release _all_ attr bufs 2) Handle out of attr bufs
parent
2258fd67
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+8
-5
No files found.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @
1f6e703d
...
...
@@ -7283,6 +7283,7 @@ Dblqh::seize_acc_ptr_list(ScanRecord* scanP, Uint32 batch_size)
{
Uint32
i
;
Uint32
attr_buf_recs
=
(
batch_size
+
30
)
/
32
;
if
(
batch_size
>
1
)
{
if
(
c_no_attrinbuf_recs
<
attr_buf_recs
)
{
jam
();
...
...
@@ -7302,7 +7303,8 @@ Dblqh::release_acc_ptr_list(ScanRecord* scanP)
{
Uint32
i
,
attr_buf_recs
;
attr_buf_recs
=
scanP
->
scan_acc_attr_recs
;
for
(
i
=
1
;
i
<
attr_buf_recs
;
i
++
)
{
for
(
i
=
1
;
i
<=
attr_buf_recs
;
i
++
)
{
release_attrinbuf
(
scanP
->
scan_acc_op_ptr
[
i
]);
}
scanP
->
scan_acc_attr_recs
=
0
;
...
...
@@ -7570,9 +7572,9 @@ void Dblqh::continueAfterReceivingAllAiLab(Signal* signal)
void
Dblqh
::
scanAttrinfoLab
(
Signal
*
signal
,
Uint32
*
dataPtr
,
Uint32
length
)
{
scanptr
.
i
=
tcConnectptr
.
p
->
tcScanRec
;
c_scanRecordPool
.
getPtr
(
scanptr
);
if
(
saveTupattrbuf
(
signal
,
dataPtr
,
length
)
==
ZOK
)
{
scanptr
.
i
=
tcConnectptr
.
p
->
tcScanRec
;
c_scanRecordPool
.
getPtr
(
scanptr
);
if
(
tcConnectptr
.
p
->
currTupAiLen
<
scanptr
.
p
->
scanAiLength
)
{
jam
();
}
else
{
...
...
@@ -8394,7 +8396,6 @@ void Dblqh::tupScanCloseConfLab(Signal* signal)
scanptr
.
p
->
m_curr_batch_size_bytes
=
0
;
sendScanFragConf
(
signal
,
ZSCAN_FRAG_CLOSED
);
}
//if
release_acc_ptr_list
(
scanptr
.
p
);
finishScanrec
(
signal
);
releaseScanrec
(
signal
);
tcConnectptr
.
p
->
tcScanRec
=
RNIL
;
...
...
@@ -8554,10 +8555,12 @@ void Dblqh::initScanTc(Signal* signal,
* ========================================================================= */
void
Dblqh
::
finishScanrec
(
Signal
*
signal
)
{
release_acc_ptr_list
(
scanptr
.
p
);
FragrecordPtr
tFragPtr
;
tFragPtr
.
i
=
scanptr
.
p
->
fragPtrI
;
ptrCheckGuard
(
tFragPtr
,
cfragrecFileSize
,
fragrecord
);
LocalDLFifoList
<
ScanRecord
>
queue
(
c_scanRecordPool
,
tFragPtr
.
p
->
m_queuedScans
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment