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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
83281cf2
Commit
83281cf2
authored
Nov 26, 2010
by
Sergey Petrunya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix buildbot failure
parent
1cf1926f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
sql/multi_range_read.cc
sql/multi_range_read.cc
+11
-3
sql/multi_range_read.h
sql/multi_range_read.h
+3
-0
No files found.
sql/multi_range_read.cc
View file @
83281cf2
...
...
@@ -834,10 +834,15 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
goto
error
;
}
}
strategy_exhausted
=
FALSE
;
res
=
strategy
->
refill_buffer
(
TRUE
);
if
(
res
&&
res
!=
HA_ERR_END_OF_FILE
)
//psergey-todo: remove EOF check here
if
(
res
)
{
if
(
res
!=
HA_ERR_END_OF_FILE
)
goto
error
;
strategy_exhausted
=
TRUE
;
}
/*
If we have scanned through all intervals in *seq, then adjust *buf to
...
...
@@ -1232,6 +1237,9 @@ void Key_value_records_iterator::move_to_next_key_value()
int
DsMrr_impl
::
dsmrr_next
(
char
**
range_info
)
{
int
res
;
if
(
strategy_exhausted
)
return
HA_ERR_END_OF_FILE
;
while
((
res
=
strategy
->
get_next
(
range_info
))
==
HA_ERR_END_OF_FILE
)
{
if
((
res
=
strategy
->
refill_buffer
(
FALSE
)))
...
...
sql/multi_range_read.h
View file @
83281cf2
...
...
@@ -544,7 +544,10 @@ class DsMrr_impl : public Buffer_manager
bool
is_mrr_assoc
;
Mrr_reader_factory
reader_factory
;
Mrr_reader
*
strategy
;
bool
strategy_exhausted
;
Mrr_index_reader
*
index_strategy
;
/* The whole buffer space that we're using */
...
...
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