Merge

mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

1 files changed, 12 insertions, 12 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 9e4c5485405..1b5b9e9bd38 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -51,7 +51,7 @@ public:
   /* changed engine indicator */
   bool engine_changed;
 
-  enum trans_res {OK, REDUCE, ERROR};
+  enum trans_res {RES_OK, RES_REDUCE, RES_ERROR};
   enum subs_type {UNKNOWN_SUBS, SINGLEROW_SUBS,
 		  EXISTS_SUBS, IN_SUBS, ALL_SUBS, ANY_SUBS};
 
@@ -193,8 +193,8 @@ public:
   void fix_length_and_dec();
 
   friend class select_exists_subselect;
-  friend class subselect_simplein_engine;
-  friend class subselect_indexin_engine;
+  friend class subselect_uniquesubquery_engine;
+  friend class subselect_indexsubquery_engine;
 };
 
 /* IN subselect */
@@ -240,7 +240,7 @@ public:
 
   friend class Item_ref_null_helper;
   friend class Item_is_not_null_test;
-  friend class subselect_indexin_engine;
+  friend class subselect_indexsubquery_engine;
 };
 
 /* ALL/ANY/SOME subselect */
@@ -327,15 +327,15 @@ public:
 };
 
 struct st_join_table;
-class subselect_simplein_engine: public subselect_engine
+class subselect_uniquesubquery_engine: public subselect_engine
 {
 protected:
   st_join_table *tab;
   Item *cond;
 public:
 
-  subselect_simplein_engine(THD *thd, st_join_table *tab_arg,
-			    Item_subselect *subs, Item *where)
+  subselect_uniquesubquery_engine(THD *thd, st_join_table *tab_arg,
+				  Item_subselect *subs, Item *where)
     :subselect_engine(thd, subs, 0), tab(tab_arg), cond(where)
   {}
     
@@ -349,14 +349,14 @@ public:
   static int end_exec(TABLE *table);
 };
 
-class subselect_indexin_engine: public subselect_simplein_engine
+class subselect_indexsubquery_engine: public subselect_uniquesubquery_engine
 {
   bool check_null;
 public:
-  subselect_indexin_engine(THD *thd, st_join_table *tab_arg,
-			    Item_subselect *subs, Item *where,
-			   bool chk_null)
-    :subselect_simplein_engine(thd, tab_arg, subs, where),
+  subselect_indexsubquery_engine(THD *thd, st_join_table *tab_arg,
+				 Item_subselect *subs, Item *where,
+				 bool chk_null)
+    :subselect_uniquesubquery_engine(thd, tab_arg, subs, where),
      check_null(chk_null)
   {}
   int exec();