- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest


client/mysqltest.c:
  Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect

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


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

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


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

where we know how to creat the vardir 
Remove unused variable

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


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

 - Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features


mysql-test/mysql-test-run.pl:
  Don't use mtr_run when executing "mysqld --verbose --help" to find
  version and supported features.

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


client/mysqltest.c:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

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


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

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


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

in all cuurently known log files 

After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

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


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

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


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

if that is same as opt_mem it can be removed

with the function where vardir's are created

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


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

 - Better control of when to create/remove vardir


mysql-test/mysql-test-run.pl:
  Split the part the function cleanup_stale_files in two parts
    - one that removes any old var directories
    - one that setup var in te proper location
  
  If running against extern server and no vardir has been created in the specified
  location, run the latter function to create the vardir structure. Else print
  message saying the vardir already exists and continue.

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


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway  


mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.

mysql-test/lib/mtr_report.pl:
  Don't output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".

And if var/ has been created, it will be recreated later so the logs will
be lost  


mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.
mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers

mysql-test-run.pl:
    Removed "use diagnostics", reduces Perl speed significantly. Can be
    enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
   Don't try output "skipped" comment if there is none (bug#24471)


mysql-test/lib/mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".

into  mysql.com:/home/kent/bk/mysql-4.1-merge

  BSD compatibility


Docs/Makefile.am:
  BSD compatibility

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree

mysql-test/lib/mtr_unique.pl:
  - add info message to mtr_require_unique_id_and_wait as suggested
  - fix for security issue
  - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected

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


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

traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.


mysql-test/lib/mtr_io.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
mysql-test/mysql-test-run.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.

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


mysql-test/Makefile.am:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge of changes for RPM

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

And it's not an "opt"

into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged