server-tools/instance-manager/instance_options.cc:
  small cleanup
  -and-
  convert mysqld_path to the proper syntax after reading
server-tools/instance-manager/parse_output.cc:
  stop using get_word since it stops at spaces.  Now we just read the entire line and trim spaces.

client/mysqltest.c:
  Fixed crash bug in debug mode and make sure q->last_argument is set right
  so that check_eol_junk() will work again.

client/mysqltest.c:
  Removed C++-isms from C file.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


mysql-test/mysql-test-run.pl:
  Auto merged

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.

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


sql/field.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

sql/field.cc:
  This code still could work for VERY out-of-dated databases
sql/spatial.cc:
  small syntax fixes

into mysql.com:/home/psergey/mysql-5.0-oct25-test

sql/sql_lex.h:
  Minor fix of a comment.
sql/table.h:
  Minor fix of a comment.

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1

into  mysql.com:/home/jimw/my/mysql-4.1-clean

include/config-netware.h:
  Merged
innobase/row/row0ins.c:
  BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not 
  propagated to 5.x
mysql-test/r/create.result:
  Auto Merged
mysql-test/t/create.test:
  Auto Merged
sql/field.cc:
  Auto Merged
sql/field.h:
  Manual Merge
sql/sql_table.cc:
  Auto Merged

into mysql.com:/home/psergey/mysql-5.0-oct25-test

into moonbone.local:/work/14138-bug-5.0-mysql

  After merge fix


sql/sql_select.cc:
  After merge fix

into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqldump.c:
  Auto merged

mysql-test/t/analyse.test:
  Auto merged
sql/sql_select.h:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-oct25-test

sql/sql_update.cc:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

into mysql.com:/home/psergey/mysql-4.1-bug14139

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged

mysql-test/r/type_newdecimal.result:
  Update result

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_prepare.cc:
  Auto merged

extra/yassl/taocrypt/src/Makefile.am:
  Build libtaoint first and then link the .o file from that into libtaocrypt.a

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  mysql.com:/home/alexi/dev/mysql-4.1-10511

 ON UPDATE CASCADE


innobase/row/row0ins.c:
  Patch from Marko is applied

into  mysql.com:/usr/home/pem/bug14256/mysql-5.0


mysql-test/r/view.result:
  Auto merged
mysql-test/r/view_grant.result:
  Merge fix.
mysql-test/t/view_grant.test:
  Merge fix.

mysql-test/r/connect.result:
  Update test result
mysql-test/t/connect.test:
  Fix test to work also when no running on standard ports.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

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

Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only 
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.

Because fields_list used not only to send data ad fields types, it's wrong 
to allow procedure redefine it. This patch separates select's fileds_list 
and procedure's one. Now if procedure is present, copy of fields_list is 
created in procedure_fields_list and it is used for sending data and fields.


mysql-test/t/analyse.test:
  Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
mysql-test/r/analyse.result:
  Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
sql/sql_select.h:
  Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
  To JOIN  Added separate fields_list for procedure.
sql/sql_select.cc:
  Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
  SELECT's fields_list and procedure's fields_list made split. If procedure is defined
  then procedure's fields_list is used to send fields and data.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


include/config-netware.h:
  Auto merged

kernel function to prevent CPU hogs.

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin


server-tools/instance-manager/listener.cc:
  Auto merged