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

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

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

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

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

add the jamEntry()

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

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

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

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

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

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

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

  remove copy/paste method in NdbIndexOperation

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

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

  two small fixes for TC
    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. 

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

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

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. 

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.

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

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

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