summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-11-22 19:34:03 +0300
committerSergey Petrunya <psergey@askmonty.org>2010-11-22 19:34:03 +0300
commita6c1d56e083bcb8ab2c32f8d89865ef46c0eb70e (patch)
tree11082d4ca44d40446621c6ea3c4db48c4b370306 /sql/multi_range_read.h
parent2ec43747f502c0a405793d30b3aa7b1b44ccc48e (diff)
downloadmariadb-git-a6c1d56e083bcb8ab2c32f8d89865ef46c0eb70e.tar.gz
MWL#121-125 DS-MRR improvements
- Address Monty's review feedback, part 1 - Fix buildbot failure
Diffstat (limited to 'sql/multi_range_read.h')
-rw-r--r--sql/multi_range_read.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index 8d9eebab74a..8aebe786310 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -137,7 +137,7 @@ class Key_value_records_iterator
public:
int init(Mrr_ordered_index_reader *owner_arg);
int get_next();
- void close_();
+ void move_to_next_key_value();
};
@@ -299,8 +299,8 @@ private:
RANGE_SEQ_IF mrr_funcs;
range_seq_t mrr_iter;
- static int key_tuple_cmp(void* arg, uchar* key1, uchar* key2);
- static int key_tuple_cmp_reverse(void* arg, uchar* key1, uchar* key2);
+ static int compare_keys(void* arg, uchar* key1, uchar* key2);
+ static int compare_keys_reverse(void* arg, uchar* key1, uchar* key2);
friend class Key_value_records_iterator;
friend class DsMrr_impl;