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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

 - Cleanup of mysqltest.c before extending it


client/mysqltest.c:
  Cleanup functions run_query_* before adding new functionality.
  Break out common functions used in both run_query_stmt and run_query_normal
  Move functionality for all run_query_* calls into run_query
  Since the normal way of handling an unepected error is to call die(which will never return), remove all return values from functions that does not return. 
  Add comments.
  Remove unused vars.
  Cleanup...
  Removed oboslete syntax @<file_name>, "require" or "result" should be used.
mysql-test/include/master-slave.inc:
  remove obsolete syntax @, use "require" command
mysql-test/include/ps_query.inc:
  Remove this comment, mysqltest will now produce output. Old mysqltest didn't return any output since command starting with @ was treated as a require. Uggh.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/r/ps_2myisam.result:
  Update test result
mysql-test/r/ps_3innodb.result:
  Update test result
mysql-test/r/ps_4heap.result:
  Update test result
mysql-test/r/ps_5merge.result:
  Update test result
mysql-test/r/ps_6bdb.result:
  Update test result
mysql-test/r/ps_7ndb.result:
  Update test result
mysql-test/t/alias.test:
  Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest
mysql-test/t/group_by.test:
  Remove --disable/enable_ps_protocol, only used to mask bugs in mysqltest
mysql-test/t/mysqltest.test:
  Add test for "Missing delimiter until eof"
mysql-test/t/union.test:
  Remove --disable/enable_ps_protocol, "select found_rows" works  with ps_protocol now!

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

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.

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

server-tools/instance-manager/listener.cc:
  every new connection should have sufficient thread stack to
  handle all IM commands
server-tools/instance-manager/manager.cc:
  change stack size of listener and guardian threads
server-tools/instance-manager/priv.cc:
  Add a new function, which is a wrapper around pthread_create to increase the stack size
server-tools/instance-manager/priv.h:
  declare new function

  Changed the parser test for wildcards in hostname to checking for empty
  strings instead (analogous with the test in default_view_definer()),
  since wildcards do appear in the definer's host-part sometimes.


mysql-test/r/view.result:
  Updated result.
mysql-test/r/view_grant.result:
  Added test for BUG#14256.
mysql-test/t/view.test:
  Changed test for explicit definer; wildcards in host are ok, empty host-part is not.
mysql-test/t/view_grant.test:
  Added test for BUG#14256.
sql/sql_yacc.yy:
  Changed test for wildcards in hostpart of explicit view definer to test for empty
  host part instead. (Analogous with sql_parse.cc:default_view_definer().)

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


config/ac-macros/yassl.m4:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
extra/yassl/taocrypt/src/Makefile.am:
  Manual merge

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged

 - Use msg argument to determine if param is required or not in safe_get_param


client/mysqltest.c:
  Use msg argument as inidicator wheter param is required or not.

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


sql/item.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

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


mysql-test/t/func_math.test:
  Auto merged
mysql-test/r/func_math.result:
  Resolve conflict
sql/item_func.cc:
  Resolve conflict