Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1


sql/sql_select.cc:
  Auto merged

3 files changed, 20 insertions, 20 deletions

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index cbda995504c..d383bf65c88 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -72,7 +72,7 @@ Item_subselect::trans_res
 Item_subselect::select_transformer(JOIN *join) 
 {
   DBUG_ENTER("Item_subselect::select_transformer");
-  DBUG_RETURN(OK);
+  DBUG_RETURN(RES_OK);
 }
 
 
@@ -214,14 +214,14 @@ Item_singlerow_subselect::select_transformer(JOIN *join)
 	cond= join->having;
       else
 	if (!(cond= new Item_cond_and(join->conds, join->having)))
-	  return ERROR;
+	  return RES_ERROR;
       if (!(substitution= new Item_func_if(cond, substitution,
 					   new Item_null())))
-	return ERROR;
+	return RES_ERROR;
     }
-    return REDUCE;
+    return RES_REDUCE;
   }
-  return OK;
+  return RES_OK;
 }
 
 void Item_singlerow_subselect::store(uint i, Item *item)
@@ -508,7 +508,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
     if (!optimizer || optimizer->fix_left(thd, up->get_table_list(), 0))
     {
       thd->lex.current_select= current;
-      DBUG_RETURN(ERROR);
+      DBUG_RETURN(RES_ERROR);
     }
     thd->lex.current_select= current;
 
@@ -528,7 +528,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
   if (select_lex->item_list.elements > 1)
   {
     my_error(ER_CARDINALITY_COL, MYF(0), 1);
-    DBUG_RETURN(ERROR);
+    DBUG_RETURN(RES_ERROR);
   }
 
   item= (Item*) select_lex->item_list.head();
@@ -546,7 +546,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
     if (join->having->fix_fields(thd, join->tables_list, &join->having))
     {
       select_lex->having_fix_field= 0;
-      DBUG_RETURN(ERROR);
+      DBUG_RETURN(RES_ERROR);
     }
     select_lex->having_fix_field= 0;
   }
@@ -570,7 +570,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
 	if (join->having->fix_fields(thd, join->tables_list, &join->having))
 	{
 	  select_lex->having_fix_field= 0;
-	  DBUG_RETURN(ERROR);
+	  DBUG_RETURN(RES_ERROR);
 	}
 	select_lex->having_fix_field= 0;
 	item= new Item_cond_or(item,
@@ -578,7 +578,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
       }
       join->conds= and_items(join->conds, item);
       if (join->conds->fix_fields(thd, join->tables_list, &join->conds))
-	DBUG_RETURN(ERROR);
+	DBUG_RETURN(RES_ERROR);
     }
     else
     {
@@ -592,7 +592,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
 	if (join->having->fix_fields(thd, join->tables_list, &join->having))
 	{
 	  select_lex->having_fix_field= 0;
-	  DBUG_RETURN(ERROR);
+	  DBUG_RETURN(RES_ERROR);
 	}
 	select_lex->having_fix_field= 0;
       }
@@ -610,11 +610,11 @@ Item_in_subselect::single_value_transformer(JOIN *join,
 	  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 		       ER_SELECT_REDUCED, warn_buff);
 	}
-	DBUG_RETURN(REDUCE);
+	DBUG_RETURN(RES_REDUCE);
       }
     }
   }
-  DBUG_RETURN(OK);
+  DBUG_RETURN(RES_OK);
 }
 
 Item_subselect::trans_res
@@ -640,7 +640,7 @@ Item_in_subselect::row_value_transformer(JOIN *join,
     if (!optimizer || optimizer->fix_left(thd, up->get_table_list(), 0))
     {
       thd->lex.current_select= current;
-      DBUG_RETURN(ERROR);
+      DBUG_RETURN(RES_ERROR);
     }
     thd->lex.current_select= current;
 
@@ -679,7 +679,7 @@ Item_in_subselect::row_value_transformer(JOIN *join,
     if (join->having->fix_fields(thd, join->tables_list, &join->having))
     {
       select_lex->having_fix_field= 0;
-      DBUG_RETURN(ERROR);
+      DBUG_RETURN(RES_ERROR);
     }
     select_lex->having_fix_field= 0;
   }
@@ -687,9 +687,9 @@ Item_in_subselect::row_value_transformer(JOIN *join,
   {
     join->conds= and_items(join->conds, item);
     if (join->conds->fix_fields(thd, join->tables_list, &join->having))
-      DBUG_RETURN(ERROR);
+      DBUG_RETURN(RES_ERROR);
   }
-  DBUG_RETURN(OK);
+  DBUG_RETURN(RES_OK);
 }
 
 Item_subselect::trans_res
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index ddb53ab616a..174e8809688 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, ALLANY_SUBS};
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 37454d93b6d..de6b2ce443f 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -324,8 +324,8 @@ JOIN::prepare(Item ***rref_pointer_array,
     {
       Item_subselect::trans_res res;
       if ((res= subselect->select_transformer(this)) !=
-	  Item_subselect::OK)
-	DBUG_RETURN((res == Item_subselect::ERROR));
+	  Item_subselect::RES_OK)
+	DBUG_RETURN((res == Item_subselect::RES_ERROR));
     }
   }