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


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

BitKeeper/deleted/.del-conf-daily-basic-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-basic-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
BitKeeper/deleted/.del-conf-daily-sql-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndb08.txt
BitKeeper/deleted/.del-conf-daily-sql-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
BitKeeper/deleted/.del-conf-dl145a.txt:
  Delete: storage/ndb/test/run-test/conf-dl145a.txt
BitKeeper/deleted/.del-conf-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-ndbmaster.txt
BitKeeper/deleted/.del-conf-shark.txt:
  Delete: storage/ndb/test/run-test/conf-shark.txt
storage/ndb/src/cw/cpcd/Makefile.am:
  new atrt
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  new atrt
storage/ndb/test/run-test/Makefile.am:
  new atrt
storage/ndb/test/run-test/atrt-gather-result.sh:
  new atrt
storage/ndb/test/run-test/atrt.hpp:
  new atrt
storage/ndb/test/run-test/main.cpp:
  new atrt
storage/ndb/test/tools/Makefile.am:
  new atrt
storage/ndb/test/run-test/autotest-boot.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-boot.sh''
storage/ndb/test/run-test/autotest-run.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-run.sh''
storage/ndb/test/run-test/conf-dl145a.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-dl145a.cnf''
storage/ndb/test/run-test/conf-ndbmaster.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-ndbmaster.cnf''
storage/ndb/test/run-test/conf-repl.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-repl.cnf''
storage/ndb/test/run-test/example-my.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/example-my.cnf''
storage/ndb/test/run-test/files.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/files.cpp''
storage/ndb/test/run-test/setup.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/setup.cpp''
storage/ndb/test/run-test/test-tests.txt:
  New BitKeeper file ``storage/ndb/test/run-test/test-tests.txt''

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


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

storage/ndb/test/src/HugoTransactions.cpp:
  restore some accidently removed hugo code
storage/ndb/test/src/UtilTransactions.cpp:
  one more abort option fix

Add abort option to lots of Hugo code, 
as it assumes it and default value has changed


storage/ndb/test/src/HugoTransactions.cpp:
  Add abort option to lots of Hugo code, 
  as it assumes it and default value has changed
storage/ndb/test/src/UtilTransactions.cpp:
  Add abort option to lots of Hugo code, 
  as it assumes it and default value has changed

  - improve error message if starting wo/ enough REDO
  - decrease likelyhood of trying to start too early


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Add new error code (that maybe should have been there a looong time)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add new check (during SR) for that sufficient REDO is present
    before continuing SR
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Add list of GCI's of nodes so that we can check for sufficient REDO during a SR
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add check for REDO during SR
    so that
  1) cluster is not trying to start too soon
  2) a better error message (than internal error) is provided if not enough REDO is present
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Add new error code (that maybe should have been there a looong time)

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


sql/ha_ndbcluster_binlog.cc:
  Auto merged

- revert bugfix, needs more work

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

On some compiler/platform combination, an assignment of form *p= *p
would map to a memcpy() call, and Valgrind flags this as an overlapped
memcpy() error.

Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
(HAVE_purify).


sql/sql_select.cc:
  Fix false valgrind warning.

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

- add ndb_share connect_count to decide if share can be reused to setup replication


sql/ha_ndbcluster.cc:
  add additional logging info
  remove inline real_free_share (not needed) and confuses valgrind printout
sql/ha_ndbcluster.h:
  add connect_count to ndb_share to enable checking for version of share
sql/ha_ndbcluster_binlog.cc:
  use ndb_share connect_count to decide if share can be reused to setup replication
  - share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
sql/ha_ndbcluster_binlog.h:
  remove inline real_free_share (not needed) and confuses valgrind printout

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


sql/ha_ndbcluster_binlog.cc:
  Auto merged

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


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  manual merge

protect the setting of ndb_schema_share = NULL with a mutex


sql/ha_ndbcluster_binlog.cc:
  protect the setting of ndb_schema_share = NULL with a mutec

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

Just a bad copy/paste of help info


client/mysqlslap.c:
  Fixed for bad option name

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
plugin/daemon_example/daemon_example.cc:
  Merged with main 5.1
sql/mysqld.cc:
  Merged with main 5.1

new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
   if not SR will fail, with this message


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Prevent node from starting _at all_ if it has performed more than 6 failed
    node restart.
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  test prg 25984
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

into  eel.(none):/home/jonas/src/51-work


storage/ndb/test/tools/listen.cpp:
  Auto merged

  fix failure during start


storage/ndb/test/tools/listen.cpp:
  fix failure during start

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

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

into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/ndb_read_multi_range.result:
  result fix
mysql-test/t/ndb_read_multi_range.test:
  test case fix

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/opt_range.cc:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_lex.h:
  manual merge

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb


sql/log_event.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/slave.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged

additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

into  trift2.:/MySQL/M51/push-5.1

BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch.


storage/ndb/src/common/debugger/EventLogger.cpp:
  Change content of error message structure

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt

  merge of the 5.0-opt tree


mysql-test/r/trigger.result:
  merge of the 5.0-opt tree

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt


mysql-test/t/trigger.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt


sql/sql_select.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment