fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)


storage/ndb/test/src/HugoOperations.cpp:
  fix ao_ignore behavior change in hugo

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

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

  remove debug printouts


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  remove debug printouts

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)

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  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb

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

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  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.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

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

fix time period calculation


sql/ha_ndbcluster_binlog.cc:
  fix time period of NDB_BINLOG_TIMER

add the jamEntry()


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add missing jamEntry() after EXECUTE_DIRECT

Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 


storage/archive/ha_archive.cc:
  Put checks around the code

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


sql/ha_ndbcluster.cc:
  Auto merged

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


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  return RNIL instead of ndbrequire if memory allocation fails

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.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
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged

1) move AbortOption from NdbTransaction to NdbOperation

2) let each operation have a "default" abort option dependant on
   operation type

   - read - AO_IgnoreError
   - dml - AbortOnError
   - scan take over - AbortOnError

3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.

   Another value to execute(AO) is equivalent to setting AO on each operation before calling execute

4) execute() does _only_ return -1 if transaction has been aborted
   otherwise, you need to check each operation for error code


sql/ha_ndbcluster.cc:
  adopt to changes in aption option handling
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Put default value on abortoption dependant on operation type
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/include/HugoOperations.hpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/src/HugoOperations.cpp:
  Move "ownership" of AbortOption to operation from transaction

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/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

  remove copy/paste method in NdbIndexOperation


storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  remove reduntant method
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  remove redundant method

  


storage/ndb/src/ndbapi/Ndb.cpp:
  Fix usage of correct types internally to ndbapi
storage/ndb/test/ndbapi/testBlobs.cpp:
  minor fixes to testBlobs

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

- no injected events if operation is not connected
- remove extra valgrind checks


sql/ha_ndbcluster_binlog.cc:
  removed extra valgrind check
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  valgrind leak
  - no injected events if operation is not connected

storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  add a judgement for arbitration rank configuration, if neither MGMD nor API nodes
  are configured with rank = 0, show warning information;
  correct indentations around patch;

sql/ha_ndbcluster_binlog.cc:
  added extra valgrind memleak checks to try to track leak

  two small fixes for TC
    1) use static syntax
    2) fix attlen handling in unique index


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) use static syntax
  2) fix attlen handling in unique index

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

Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 


client/client_priv.h:
  More options
client/mysqlslap.c:
  Extended the auto-sql in the following ways:
  1) You can now specify a load type of either "mixed", "read", or "write". Not great, but a definite improvement.
  2) A new option allows you to specify how many rows are inserted for the "read" load. 
  
  I also fixed a bug where limit was not being reached by running threads.
mysql-test/r/mysqlslap.result:
  Updated results