MWL#121-125 DS-MRR improvements

- Address Monty's review feedback, portion 2

1 files changed, 4 insertions, 7 deletions

diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index 07e6295a021..2d0c1486aba 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -133,10 +133,10 @@ class Key_value_records_iterator
   */
   bool get_next_row;
   
-  uchar *cur_index_tuple; /* key_buffer.read() reads to here */
+  //uchar *cur_index_tuple; /* key_buffer.read() reads to here */
 public:
   int init(Mrr_ordered_index_reader *owner_arg);
-  int get_next();
+  int get_next(char **range_info);
   void move_to_next_key_value();
 };
 
@@ -281,9 +281,6 @@ private:
 
   bool scanning_key_val_iter;
   
-  /* Key_value_records_iterator::read() will place range_info here */
-  char *cur_range_info;
-
   /* Buffer to store (key, range_id) pairs */
   Lifo_buffer *key_buffer;
   
@@ -367,8 +364,8 @@ private:
   Lifo_buffer *rowid_buffer;
   
   /* rowid_buffer.read() will set the following:  */
-  uchar *rowid;
-  uchar *rowids_range_id;
+  //uchar *rowid;
+  //uchar *rowids_range_id;
 
   int refill_from_index_reader();
 };