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

into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

1 files changed, 7 insertions, 4 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 1adefb6492e..56864109a04 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -180,7 +180,7 @@ public:
 class Item_exists_subselect :public Item_subselect
 {
 protected:
-  longlong value; /* value of this item (boolean: exists/not-exists) */
+  bool value; /* value of this item (boolean: exists/not-exists) */
 
 public:
   Item_exists_subselect(st_select_lex *select_lex);
@@ -226,7 +226,8 @@ public:
 
   Item_in_subselect(Item * left_expr, st_select_lex *select_lex);
   Item_in_subselect()
-    :Item_exists_subselect(), abort_on_null(0), transformed(0), upper_item(0)
+    :Item_exists_subselect(), optimizer(0), abort_on_null(0), transformed(0),
+     upper_item(0)
   {}
 
   subs_type substype() { return IN_SUBS; }
@@ -237,12 +238,14 @@ public:
     was_null= 0;
   }
   trans_res select_transformer(JOIN *join);
-  trans_res single_value_transformer(JOIN *join,
-				     Comp_creator *func);
+  trans_res select_in_like_transformer(JOIN *join, Comp_creator *func);
+  trans_res single_value_transformer(JOIN *join, Comp_creator *func);
   trans_res row_value_transformer(JOIN * join);
   longlong val_int();
   double val_real();
   String *val_str(String*);
+  my_decimal *val_decimal(my_decimal *);
+  bool val_bool();
   void top_level_item() { abort_on_null=1; }
   bool test_limit(st_select_lex_unit *unit);
   void print(String *str);