fixes for ft-boolean and range optimizer

3 files changed, 2 insertions, 7 deletions

diff --git a/sql/opt_ft.h b/sql/opt_ft.h
index dcbbb8abcec..b055edc107c 100644
--- a/sql/opt_ft.h
+++ b/sql/opt_ft.h
@@ -29,7 +29,7 @@ public:
   TABLE_REF *ref;
 
   FT_SELECT(TABLE *table, TABLE_REF *tref) :
-      QUICK_SELECT (table,tref->key,1), ref(tref) {}
+      QUICK_SELECT (table,tref->key,1), ref(tref) { init(); }
 
   int init() { return error=file->ft_init(); }
   int get_next() { return error=file->ft_read(record); }
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 3849159ca39..4c22dc5b6a2 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -407,11 +407,6 @@ QUICK_SELECT::~QUICK_SELECT()
   }
 }
 
-int QUICK_SELECT::init()
-{
-  return error=file->index_init(index);
-}
-
 QUICK_RANGE::QUICK_RANGE()
   :min_key(0),max_key(0),min_length(0),max_length(0),
    flag(NO_MIN_RANGE | NO_MAX_RANGE)
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 50215b94be0..07d1216a42f 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -75,7 +75,7 @@ public:
   QUICK_SELECT(TABLE *table,uint index_arg,bool no_alloc=0);
   virtual ~QUICK_SELECT();
   void reset(void) { next=0; it.rewind(); }
-  virtual int init();
+  int init() { return error=file->index_init(index); }
   virtual int get_next();
   int cmp_next(QUICK_RANGE *range);
   bool unique_key_range();