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

  incorrect handling of commit/ignore error in unique index code

  add testcase

  make sure apicon timer is reset when setting CS_CONNECTED

  make sure not too poll to long, in case of hb-failure of last db-node

  make sure DISK flag is set on DATA column for blob table

  split assignment into 2 lines

  Fix in bug fix, make sure LCP_SKIP is only used for inserts...

  Fix start transaction with hint from ndbapi

  Fix bug in previous changeset...causing SR problems with disk

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

  fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)

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

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

  Fix correct log event on db-node disconnect

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

  1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)

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

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

  fixed a valgrind problem

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

  SR crash if table with disk with hidden primary key...

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)