diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-12-17 13:06:21 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-12-17 13:06:21 +0300 |
| commit | 80cbf3a1c22e6ac854329fa7d61868e5be96f8ce (patch) | |
| tree | 0f6b693ea92efa44b50b91421e240efc4e9eba00 | |
| parent | c696fb6ef34d967b2b6383a333802df14c975d94 (diff) | |
| download | mariadb-git-80cbf3a1c22e6ac854329fa7d61868e5be96f8ce.tar.gz | |
Small code cleanups
| -rw-r--r-- | sql/multi_range_read.cc | 5 | ||||
| -rw-r--r-- | sql/multi_range_read.h | 1 |
2 files changed, 3 insertions, 3 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); diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h index d305346d1f3..1851dc4912f 100644 --- a/sql/multi_range_read.h +++ b/sql/multi_range_read.h @@ -133,7 +133,6 @@ class Key_value_records_iterator */ bool get_next_row; - //uchar *cur_index_tuple; /* key_buffer.read() reads to here */ public: int init(Mrr_ordered_index_reader *owner_arg); int get_next(char **range_info); |