summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-12-17 13:06:21 +0300
committerSergey Petrunya <psergey@askmonty.org>2010-12-17 13:06:21 +0300
commite5203265b011204f7e8f114b8bcc2de8c7f1e58b (patch)
tree0f6b693ea92efa44b50b91421e240efc4e9eba00 /sql/multi_range_read.cc
parent4b1399c09ced51b33148265a334fda162b5f09c6 (diff)
downloadmariadb-git-e5203265b011204f7e8f114b8bcc2de8c7f1e58b.tar.gz
Small code cleanups
Diffstat (limited to 'sql/multi_range_read.cc')
-rw-r--r--sql/multi_range_read.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index c30b8df8e13..060aac2d7ba 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -230,7 +230,7 @@ handler::multi_range_read_init(RANGE_SEQ_IF *seq_funcs, void *seq_init_param,
int handler::multi_range_read_next(char **range_info)
{
int result= HA_ERR_END_OF_FILE;
- int range_res;
+ bool range_res;
DBUG_ENTER("handler::multi_range_read_next");
if (!mrr_have_range)
@@ -1005,7 +1005,8 @@ int DsMrr_impl::setup_two_handlers()
if (res)
goto error;
}
- if ((primary_file->inited != handler::RND) && primary_file->ha_rnd_init(FALSE))
+ if ((primary_file->inited != handler::RND) &&
+ (res= primary_file->ha_rnd_init(FALSE)))
goto error;
}
DBUG_RETURN(0);