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

into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas

  Make sure that error gets set corretly also
    when error code directly after taking mutex


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Make sure that error gets set corretly also
    when error code directly after taking mutex

  restore --with-ndb-ccflags functionality


config/ac-macros/ha_ndbcluster.m4:
  restore --with-ndb-ccflags functionality

  impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases


storage/ndb/src/ndbapi/ClusterMgr.cpp:
  impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
storage/ndb/test/src/NDBT_Test.cpp:
  impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas

storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

  Print (and optionally specify) random seed


storage/ndb/test/src/NDBT_Test.cpp:
  Print (and optionally specify) random seed

  fix bug in tup scan wrt LCP


storage/ndb/include/kernel/signaldata/AccScan.hpp:
  Add LCP flag to AccScan and ScanFrag
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
  Add LCP flag to AccScan and ScanFrag
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup sets LCP scan when lcp
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add LCP scan flag
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add LCP scan flag
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Fix assignment of scan record wrt LCP and disk

  fix release compile error


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix release compile

  fix gcc4 compile error


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  add block to remove gcc compiler error
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add jamEntry

  update test prg + fix typo


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  compile error
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  upgrade test prg not to kill master node
    as master take over wont work with all these dealyed GCP_PREPARE

  second try - handle CS_PREPARE_TO_COMMIT explicitly


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle CS_PREPARE_TO_COMMIT explictly

  add assertion


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Add assertion that we dont try to read key from lqh on scan (as it does not have key...)

  also close scan which are in "delivered" state, as it's impossible to release locks afterwards


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  store new op when converting WRITE to UPDATE so that ACCKEYCONF gets correct


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  store new op when converting WRITE to UPDATE so that ACCKEYCONF gets correct

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


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.


ndb/src/kernel/blocks/ERROR_codes.txt:
  error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  2 new error inserts
  7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
  7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  autotest

- move clear of slock until after completion of data events on the binlog

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait


mysql-test/r/rpl_ndb_log.result:
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
mysql-test/t/disabled.def:
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


BitKeeper/deleted/.del-ndb_rename.result:
  Delete: mysql-test/r/ndb_rename.result
BitKeeper/deleted/.del-ndb_rename.test:
  Delete: mysql-test/t/ndb_rename.test
sql/ha_ndbcluster.cc:
  Merge (using local)
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Merge (using local)

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

  print some in case of error


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print scan state in case of error

Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new

  fix return value of "testBasic -n InsertError2 T1"


storage/ndb/test/ndbapi/testBasic.cpp:
  fix return value

  fix testNodeRestart -n Bug18612 when running with only 1 node group


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  This test needs 2 node groups.

ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
+ increase timeout for sync... which now should never occur

into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new

into lmy004.:/work/mysql-5.1-runtime

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/information_schema.test:
  Merge
mysql-test/t/wait_timeout.test:
  Merge
sql/mysqld.cc:
  Merge
sql/slave.cc:
  Null merge
sql/sp_head.cc:
  Merge

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/mysqld.cc:
  Auto merged