mysql-test/r/derived.result:
  result updated

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_strfunc.cc:
  Auto merged

into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.clean

sql/sql_lex.cc:
  We need these to be clean.
  Otherwise restoring of the order_list and group_list could fail
  in mysql_stmt_execute()

  Rewrote to comply the coding style


sql/sql_string.cc:
  Rewrote to comply the coding style

Actually no PS-related methods were exported.
Now they're in the libmysqld.def


VC++Files/libmysqld/libmysqld.def:
  PS related methods added

sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/derived.result:
  SCCS merged
mysql-test/t/derived.test:
  e
  merge

mysql-test/t/multi_update.test:
  new results of changed multi-delete
mysql-test/t/update.test:
  new results of changed multi-delete
mysql-test/r/multi_update.result:
  new results of changed multi-delete
mysql-test/r/update.result:
  new results of changed multi-delete

into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged

Some errorneous code trimmed


sql/item.cc:
  initialization of the Item_type_holder::orig_item added
sql/item.h:
  No use to call cleanup() in ~Item
  this only calls Item::cleanup()
  
  We should use item->delete_self() instead of 'delete item' now
  
  Code added to restore Item_type_holder::item_type value
sql/item_row.h:
  this cleanup is wrong
sql/item_sum.cc:
  initialization added
sql/item_sum.h:
  Item_xxx& -> Item_xxx*
sql/sql_parse.cc:
  delete item -> item->delete_self()

  Remove extra mtr_start()


innobase/row/row0sel.c:
  Remove extra mtr_start()

into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1

mysql-test/r/func_misc.result:
  added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
  added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
  Change Item_func_inet_aton::val_int to parse short-forms addresses correctly

into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Superfluous line removed


sql/sql_prepare.cc:
  Line is not needed

Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()


sql/item.cc:
  Item& -> Item*
sql/item.h:
  Item& -> Item*
sql/item_cmpfunc.cc:
  Item& -> Item*
sql/item_cmpfunc.h:
  Item& -> Item*
sql/item_func.cc:
  Item& -> Item*
sql/item_func.h:
  Item& -> Item*
sql/item_sum.cc:
  Item& -> Item*
sql/item_sum.h:
  Item& -> Item*
sql/item_uniq.h:
  Item& -> Item*
sql/sql_prepare.cc:
  Code cleanup
sql/sql_select.cc:
  Item& -> Item*

into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.h:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182


client/mysqldump.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-fix

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(same as ChangeSet@1.1538.36.1, 2003-06-12 12:41:29+02:00, serg@serg.mylan, "FT2 bug in mi_delete fixed")
BUG#2417

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


sql/sql_derived.cc:
  Auto merged

test fixed

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

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


sql/sql_derived.cc:
  Auto merged

sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

check of memory allocation operation was added


mysql-test/r/subselect_innodb.result:
  switched to new syntax
mysql-test/t/subselect_innodb.test:
  switched to new syntax
sql/sql_select.cc:
  check of memory allocation operation

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