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

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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index d3aa8f59e49..9e4c5485405 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -216,7 +216,8 @@ public:
 
   Item_in_subselect(THD *thd, Item * left_expr, st_select_lex *select_lex);
   Item_in_subselect(Item_in_subselect *item);
-  Item_in_subselect(): Item_exists_subselect(), abort_on_null(0) {}
+  Item_in_subselect()
+    :Item_exists_subselect(), abort_on_null(0), upper_not(0) {}
 
   subs_type substype() { return IN_SUBS; }
   void reset() 
@@ -237,7 +238,6 @@ public:
   void top_level_item() { abort_on_null=1; }
   bool test_limit(st_select_lex_unit *unit);
 
-  friend class Item_asterisk_remover;
   friend class Item_ref_null_helper;
   friend class Item_is_not_null_test;
   friend class subselect_indexin_engine;