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
e16c4317
Commit
e16c4317
authored
Aug 24, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb -
bug#21800 - 5.0 -> 5.1 merge
parent
16599273
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
storage/ndb/src/ndbapi/NdbScanOperation.cpp
storage/ndb/src/ndbapi/NdbScanOperation.cpp
+7
-7
No files found.
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View file @
e16c4317
...
...
@@ -496,6 +496,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
idx
=
m_current_api_receiver
;
last
=
m_api_receivers_count
;
Uint32
timeout
=
tp
->
m_waitfor_timeout
;
do
{
if
(
theError
.
code
){
...
...
@@ -521,8 +522,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
/**
* No completed...
*/
int
ret_code
=
poll_guard
.
wait_scan
(
WAITFOR_SCAN_TIMEOUT
,
nodeId
,
forceSend
);
int
ret_code
=
poll_guard
.
wait_scan
(
3
*
timeout
,
nodeId
,
forceSend
);
if
(
ret_code
==
0
&&
seq
==
tp
->
getNodeSequence
(
nodeId
))
{
continue
;
}
else
{
...
...
@@ -1425,13 +1425,13 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed,
return
-
1
;
Uint32
seq
=
theNdbCon
->
theNodeSequence
;
Uint32
nodeId
=
theNdbCon
->
theDBnode
;
Uint32
timeout
=
tp
->
m_waitfor_timeout
;
if
(
seq
==
tp
->
getNodeSequence
(
nodeId
)
&&
!
send_next_scan_ordered
(
s_idx
)){
Uint32
tmp
=
m_sent_receivers_count
;
s_idx
=
m_current_api_receiver
;
while
(
m_sent_receivers_count
>
0
&&
!
theError
.
code
){
int
ret_code
=
poll_guard
.
wait_scan
(
WAITFOR_SCAN_TIMEOUT
,
nodeId
,
forceSend
);
int
ret_code
=
poll_guard
.
wait_scan
(
3
*
timeout
,
nodeId
,
forceSend
);
if
(
ret_code
==
0
&&
seq
==
tp
->
getNodeSequence
(
nodeId
))
{
continue
;
}
...
...
@@ -1574,12 +1574,13 @@ NdbScanOperation::close_impl(TransporterFacade* tp, bool forceSend,
return
-
1
;
}
Uint32
timeout
=
tp
->
m_waitfor_timeout
;
/**
* Wait for outstanding
*/
while
(
theError
.
code
==
0
&&
m_sent_receivers_count
)
{
int
return_code
=
poll_guard
->
wait_scan
(
WAITFOR_SCAN_TIMEOUT
,
nodeId
,
forceSend
);
int
return_code
=
poll_guard
->
wait_scan
(
3
*
timeout
,
nodeId
,
forceSend
);
switch
(
return_code
){
case
0
:
break
;
...
...
@@ -1647,8 +1648,7 @@ NdbScanOperation::close_impl(TransporterFacade* tp, bool forceSend,
*/
while
(
m_sent_receivers_count
+
m_api_receivers_count
+
m_conf_receivers_count
)
{
int
return_code
=
poll_guard
->
wait_scan
(
WAITFOR_SCAN_TIMEOUT
,
nodeId
,
forceSend
);
int
return_code
=
poll_guard
->
wait_scan
(
3
*
timeout
,
nodeId
,
forceSend
);
switch
(
return_code
){
case
0
:
break
;
...
...
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