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


storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

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


mysql-test/r/view.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
configure.in:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492

- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error

- added retry handling of temporary transaction errors

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

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

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

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

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

storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  backup 5.0->5.1 merge

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


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

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


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

  Unleash backup to write more than 32k at a time
  Using parameter BackupMaxWriteSize
  (greatly affect LCP time in 5.1, set default value to 256k)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add config fro max write size in backup
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Unleash backup to write more than 32k at a time
ndb/src/mgmsrv/ConfigInfo.cpp:
  Add config fro max write size in backup

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

  fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr

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


ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  Fix alignment of sockaddr(_in)


ndb/src/common/transporter/Transporter.cpp:
  Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
  Fix alignment of sockaddr(_in)

  ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)


ndb/include/util/SocketServer.hpp:
  Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
  Increase default max session to ~0

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work

mysql-test/r/innodb_mysql.result:
  Fix result.

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


mysql-test/t/disabled.def:
  Auto merged

  clone-off for 5.0.21


configure.in:
  clone-off for 5.0.21

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged

 Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.