Post-merge fixes for index_merge/Unique/5.0

mysql-test/r/index_merge.result:
  Post-merge fixes
mysql-test/r/index_merge_innodb.result:
  Post-merge fixes
sql/opt_range.cc:
  Post-merge fixes
sql/opt_range.h:
  Post-merge fixes

2 files changed, 4 insertions, 5 deletions

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 91b3fa66169..5f282695494 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1169,9 +1169,9 @@ end:
   DBUG_EXECUTE("info",
     {
       if (quick_imerge)
-        print_quick_sel_imerge(quick_imerge, needed_reg);
+        print_quick_sel_imerge(quick_imerge, &needed_reg);
       else
-        print_quick_sel_range((QUICK_RANGE_SELECT*)quick, needed_reg);
+        print_quick_sel_range((QUICK_RANGE_SELECT*)quick, &needed_reg);
     }
   );
 
@@ -1720,7 +1720,6 @@ tree_and(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
     uint flag=0;
     if (*key1 || *key2)
     {
-      trees_have_key = true;
       if (*key1 && !(*key1)->simple_key())
 	flag|=CLONE_KEY1_MAYBE;
       if (*key2 && !(*key2)->simple_key())
diff --git a/sql/opt_range.h b/sql/opt_range.h
index e312dd39bad..9e392104818 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -88,7 +88,7 @@ public:
   QUICK_SELECT_I();
   virtual ~QUICK_SELECT_I(){};
   virtual int  init() = 0;
-  virtual void reset(void) = 0;
+  virtual int  reset(void) = 0;
   virtual int  get_next() = 0;   /* get next record to retrieve */
   virtual bool reverse_sorted() = 0;
   virtual bool unique_key_range() { return false; }
@@ -140,7 +140,7 @@ public:
                      MEM_ROOT *parent_alloc=NULL);
   ~QUICK_RANGE_SELECT();
   
-  void reset(void) { next=0; it.rewind(); }
+  int reset(void) { next=0; it.rewind(); return 0; }
   int init();
   int get_next();
   bool reverse_sorted() { return 0; }