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

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


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix so that node version is recomputed at node failure

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


sql/sql_show.cc:
  Auto merged

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

1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world. 


include/mysql/plugin.h:
  Added new I_S type.
mysql-test/r/archive.result:
  Fixed not dropped table.
mysql-test/t/archive.test:
  Added additional drop table
sql/sql_plugin.cc:
  Adding support in for the I_S.
sql/sql_show.cc:
  Added schema type for plugin I_S. Additional loops were added to pop these on to the end of requests.
storage/archive/ha_archive.cc:
  Windwos typo

For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.


mysql-test/r/archive.result:
  Modified error output
mysql-test/t/archive.test:
  Fix for the change in behavior
storage/archive/ha_archive.cc:
  ifdef of the search record code

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

It also refactors the test case for Archive (removed two bad tests).


mysql-test/r/archive.result:
  refactor archive test
mysql-test/t/archive.test:
  Large  refactoring of Archive test
storage/archive/ha_archive.cc:
  Updated comments.
  Added NULL packing hack
  Fixed bug in wrong display of auto increment in show create table

storage/archive/archive_reader.c:
  Add option to autoincrement file.
storage/archive/ha_archive.cc:
  Fixed warning

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


sql/item.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged