into  perch.ndb.mysql.com:/home/jonas/src/51-work

  master failure during master take over

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

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  backport fix from 5.1

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  make lockpages=1 run a bit earlier in startup

  increase timeout on slow test

  Fix testcase so that it does not leak tables...causing subsequent errors

    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result

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

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

  remove debug printouts

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

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

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

  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

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