mysql-test/mysql-test-run.pl:
  .err files of the mysqld servers should be appended to, not reset every time we restart
  the mysqlds during the testsuite.

into  127.(none):/home/osku/mysql/5.0/clean

into polly.local:/home/kaa/src/mysql-5.0

into  127.(none):/home/osku/mysql/5.0/clean

innobase/include/trx0trx.h:
  Change trx_set_detailed_error's second argument to const char*.
innobase/trx/trx0trx.c:
  Change trx_set_detailed_error's second argument to const char*.

  Define SHUT_RDWR for OpenServer 5


server-tools/instance-manager/portability.h:
  Define SHUT_RDWR for OpenServer 5

    Replaced the dumb in-handler/not-in-handler check with a proper recursion
    check of handlers being executed.
    (Re-commit in a different tree, to make push possible.)


mysql-test/r/sp.result:
  New test case for BUG#6127.
mysql-test/t/sp.test:
  New test case for BUG#6127.
sql/sp_head.cc:
  Replaced the setting of ctx->in_handler with a enter/exit handler methods.
sql/sp_rcontext.cc:
  Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
sql/sp_rcontext.h:
  Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
  (And added some comments in the sp_rcontext class.)

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

For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.


sql/sql_cache.cc:
  Fix bug #13424 locking view with query cache enabled crashes server
  Added check that table is completely opened.
mysql-test/t/view_query_cache.test:
  Test case for bug#13424 locking view with query cache enabled crashes server
mysql-test/r/view_query_cache.result:
  Test case for bug#13424 locking view with query cache enabled crashes server

into  mysql.com:/home/mydev/mysql-5.0-5000

into  127.(none):/home/osku/mysql/5.0/clean

innobase/row/row0ins.c:
  Don't assert on temp file creation failure.

sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-5000

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

into  mysql.com:/home/mydev/mysql-5.0-5000

into mysql.com:/home/psergey/mysql-5.0-bug13317

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


sql/handler.cc:
  Auto merged

  Windows have no 'cat' command, use <
mysql.test:
  Windows can't handle single quotes in --exec line


mysql-test/t/mysql.test:
  Windows can't handle single quotes in --exec line
mysql-test/t/mysqlbinlog.test:
  Windows have no 'cat' command, use <

into mysql.com:/home/psergey/mysql-5.0-merge-sept24

myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Manually merged.

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

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

into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  merge

  Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.

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

  Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.

  Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block


innobase/row/row0ins.c:
  Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block

work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")


sql/mysqld.cc:
  handle_connections_namedpipes():
    THD::host member has moved to the Security_context class.
    New THD::security_ctx member points to active security context.

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


sql/item_strfunc.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-5000


myisam/mi_dbug.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged

After merge fix

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407

into  127.(none):/home/osku/mysql/5.0/clean

into  127.(none):/home/osku/mysql/5.0/3443


innobase/dict/dict0dict.c:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Merge fixes.
mysql-test/t/innodb.test:
  Merge fixes.