from command line did not work.

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

  Fixed a typo bug.


sql/mysqld.cc:
  Fixed a typo bug.

into rurik.mysql.com:/home/igor/mysql-4.1

sql/lex.h:
  Wrong define name

sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
include/mysqld_error.h:
  merging
sql/share/english/errmsg.txt:
  merging

WL#1163 (Make spatial code separable)
fixes before the push


include/my_global.h:
  Temporary place for these defines
include/mysqld_error.h:
  ER_FEATURE_DISABLED definition
sql/item_geofunc.cc:
  #ifdef HAVE_SPATIAL moved to the better place
sql/share/english/errmsg.txt:
  Message for ER_FEATURE_DISABLED

starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them.

wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions


sql/gen_lex_hash.cc:
  mysql_priv.h was included for SYM_GROUP declaration
sql/lex.h:
  sym_group_xxx made global so we can use texts from them
  throughout the code
sql/lex_symbol.h:
  SYM_GROUP declaration moved to mysql_priv.h
sql/mysql_priv.h:
  declarations about SYM_GROUP
sql/sql_table.cc:
  sym_group_xxx objects used instead of text constants
  a couple of HAVE_SPATIAL removed
sql/sql_yacc.yy:
  sym_group_xxx used instead of text constants
  some duplicated code restructured
  MYF(0) parameters removed from net_printf calls

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

CONVERT(expr, expr, expr);


mysql-test/t/mysqldump.test:
  fix for my previous result fix of Jani's changes.

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


sql/item_strfunc.cc:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

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()

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  Remove extra mtr_start()


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

into rurik.mysql.com:/home/igor/mysql-4.1

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