After merge fixes

Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc

1 files changed, 5 insertions, 0 deletions

diff --git a/sql/opt_range.h b/sql/opt_range.h
index 122d444af31..3082e2d8a69 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -133,6 +133,9 @@ public:
       other  Error code
   */
   virtual int  reset(void) = 0;
+
+  /* Range end should be called when we have looped over the whole index */
+  virtual void range_end() {}
   virtual int  get_next() = 0;   /* get next record to retrieve */
   virtual bool reverse_sorted() = 0;
   virtual bool unique_key_range() { return false; }
@@ -273,6 +276,8 @@ public:
   }
   int init();
   int get_next();
+  void range_end();
+
   bool reverse_sorted() { return 0; }
   bool unique_key_range();
   int init_ror_merged_scan(bool reuse_handler);