database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Small code cleanups

Browse Source
This commit is contained in:
Sergey Petrunya
2010-12-17 13:06:21 +03:00
parent c696fb6ef3
commit 80cbf3a1c2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/multi_range_read.cc
View File

@@ -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 handler::multi_range_read_next(char **range_info)
{ {
int result= HA_ERR_END_OF_FILE; int result= HA_ERR_END_OF_FILE;
int range_res; bool range_res;
DBUG_ENTER("handler::multi_range_read_next"); DBUG_ENTER("handler::multi_range_read_next");
if (!mrr_have_range) if (!mrr_have_range)
@@ -1005,7 +1005,8 @@ int DsMrr_impl::setup_two_handlers()
if (res) if (res)
goto error; 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; goto error;
} }
DBUG_RETURN(0); DBUG_RETURN(0);

1
sql/multi_range_read.h
View File

@@ -133,7 +133,6 @@ class Key_value_records_iterator
*/ */
bool get_next_row; bool get_next_row;
//uchar *cur_index_tuple; /* key_buffer.read() reads to here */
public: public:
int init(Mrr_ordered_index_reader *owner_arg); int init(Mrr_ordered_index_reader *owner_arg);
int get_next(char **range_info); int get_next(char **range_info);