into  zim.(none):/home/brian/mysql/merge-5.1


sql/ha_archive.cc:
  Merge to remove writes. Also removed one unneeded DBUG_PRINT
sql/ha_archive.h:
  Merge

  Avoid embedding a bunch of whitespace in --help message.


client/mysqlslap.c:
  Avoid embedding a bunch of whitespace in --help message.

sql/set_var.cc:
  Fix merge.

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny


sql/set_var.cc:
  Manual merge.

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  mysql.com:/home/psergey/mysql-5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

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

into  zim.(none):/home/brian/mysql/mysql-5.0

This patch restores sync_binlog.


sql/set_var.cc:
  restoring sync_binlog variable

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

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  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  mysql.com:/home/mydev/mysql-5.1-bug18129

into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug

into  mysql.com:/home/mydev/mysql-5.1-bug18129

into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


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

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  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.