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


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

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

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

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

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

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

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  continueb enable expand check loop
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  continueb enable expand check loop

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  don't set errno without a real error

mysys/my_pread.c:
  don't set errno without a real error

into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

(It failed even if test was marked as skipped)



sql/ha_ndbcluster.cc:
  Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  Fix our implementation of pread/pwrite: we did change the file pointer in our
  implementation, while the normal preads/pwrites don't. The new code is based
  on glibc version of pread/pwrite.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

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

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

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


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

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


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

  Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))


ndb/test/ndbapi/testNodeRestart.cpp:
  Fix testNodeRestart -n DuringLCP and others

into  mysql.com:/home/stewart/Documents/MySQL/5.1/ndb


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge

+ adopted signal to be as close as possible to 5.1...

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

Mark events_stress.test as 'big' as it's very slow on some machines


BitKeeper/etc/ignore:
  added server-tools/instance-manager/net_serv.cc
mysql-test/t/events_stress.test:
  Slow test: only run when using --big
mysql-test/t/rpl_ndb_auto_inc.test:
  Fix failing test

into  mysql.com:/home/my/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into moonbone.local:/home/evgen/mysql-5.1-new

into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge


sql/mysqld.cc:
  Auto merged

mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged