into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0

  fixed a valgrind problem

   fixed a valgrind warning
type_varchar.test:
  fixed a valgrind warning

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

  Disabled abi_check, as it was before merge

into  mysql.com:/home/kent/bk/mysql-5.1-build

  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)

into  mysql.com:/home/kent/bk/mysql-5.1-build

into  mysql.com:/home/kent/bk/mysql-5.1-build

  Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def

  Adjusted for storage path
nwbootstrap:
  Corrected bad merge

into  mysql.com:/home/kent/bk/mysql-5.1-build

into  mysql.com:/home/kent/bk/mysql-5.0-build

into  mysql.com:/home/kent/bk/mysql-5.1-build

  Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Handle events "differently" so that dict doesnt get lock too often

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  This prevent any subsequent node restarts, but it's better than crashing an alive node

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  Skip rollback if only committedRead in transaction

  fixes to testprogram to test new impl. in 5.1

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build