Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle not started nodes correctly
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP

  fix so backup message is printed even in case of "ndb_mgm -e"


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  fix backup printer
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix so that backup message is printed even if "ndb_mgm -e"
storage/ndb/src/ndbapi/SignalSender.cpp:
  move method into TransporterFacade to enable API_TRACE
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  move method into TransporterFacade to enable API_TRACE

  Resend if master dies during alloc node id


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error code
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add new error code
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure to resend if master died
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

  1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
  


storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Make sure not to read uninitialized data in unique index code
    harmless (atleast before dynattr)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont update p_latest_trans_gci
    for dirty unique index lookup

  Make sure LCP scan record is correct initialized


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Init ScanOp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  And set correct pointers...

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  merge

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge

  update error code list
  (for bug#24447)


ndb/src/kernel/blocks/ERROR_codes.txt:
  ndb -
    update error code list

  api disconnect just after SCAN_TABREQ


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
  2) handle error :-)
ndb/test/ndbapi/testScan.cpp:
  Add etstcase for bug 24447
ndb/test/run-test/daily-basic-tests.txt:
  Add etstcase for bug 24447

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


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  merge

  Fix bug wrt to '\r' handling in latest commit to bug#24011


ndb/src/common/util/InputStream.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011
ndb/src/common/util/socket_io.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011

  Make sure index scan does not commitDelete


mysql-test/r/ndb_index_ordered.result:
  testcase
mysql-test/t/ndb_index_ordered.test:
  testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure index scan does not commitDelete

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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  merge

  


ndb/src/common/util/socket_io.cpp:
  Fix problem with cut sockmessages

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


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

  Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release

  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes


storage/ndb/src/mgmsrv/Services.cpp:
  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes

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


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge

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


ndb/include/kernel/ndb_limits.h:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  SCCS merged

  Fix some too small buffers in backup
  


ndb/include/kernel/ndb_limits.h:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE

    Fix bug in restore with table with many columns, Compute size of databuffer pool correctly

    Add better error message if getting error in RESTORE

    when doing create unique index which mysql will silently converts to PK, ndb is not informed
    so table will be useless.
  
    change so that we never do online add index wo/ primary key.
    this is not good, but it's better than a useless table

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

  and use it for testOperations/testTransactions


storage/ndb/test/include/NDBT_Test.hpp:
  Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
  Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
  Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
  Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
  Add support for temporary tables in hugo

  fix another incorrect assertion


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  clear m_transaction_nodes.clear()
  to avoid asserion in debug-compiled in releaseApiCon

  Dont assert when getting gci=0 in read only transaction


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont assert when getting gci=0 in read only transaction

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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge

  this changes lock taken during peek, to decrease likelyhood of transaction abort
  


sql/ha_ndbcluster.cc:
  use exclusive lock in peek, as peek is used just before insert/update

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


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

  make sure not to release log buffer twice (or several times) in case of abort of multi update


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  make sure not to release log buffer twice (or several times) in case of abort of multi update

  Make sure postExecute is not run for blobs if AO_IgnoreError


ndb/src/ndbapi/NdbConnection.cpp:
  If AO_IgnoreError, error codes arent always set on individual operations, making postExecute impossible

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged