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

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index ff469deab30..8d0ccba0f37 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -91,9 +91,8 @@ protected:
 public:
   Item_in_optimizer(Item *a, Item_in_subselect *b):
     Item_bool_func(a, (Item *)b), cache(0) {}
-  // used by row in transformer
-  bool preallocate_row();
   bool fix_fields(THD *, struct st_table_list *, Item **);
+  bool fix_left(THD *thd, struct st_table_list *tables, Item **ref);
   bool is_null();
   /*
     Item_in_optimizer item is special boolean function. On value request 
@@ -103,7 +102,7 @@ public:
     Item_in_optimizer return NULL, else it evaluate Item_in_subselect.
   */
   longlong val_int();
-  
+  const char *func_name() const { return "IN_OPTIMIZER"; }
   Item_cache **get_cache() { return &cache; }
 };