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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

  fix printout
  crashes testSystemRestart -n SR_UNDO


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix printout
  crashes testSystemRestart -n SR_UNDO

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

(part 1)
- add signal data
- add ref in dict on create/drop table/index

- terminate printing

- only creat systable if conencted to ndb

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge

ndb - 5.1.16 uint64 align for ndb_restore
(backport)


ndb/src/ndbapi/NdbRecAttr.cpp:
   ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
  (backport)
ndb/tools/restore/Restore.cpp:
   ndb - 5.1.16 uint64 align for ndb_restore
  (backport)

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
  manual merge

  #if => #ifdef


storage/myisam/mi_open.c:
  #if => #ifdef

storage/ndb/tools/restore/Restore.cpp:
  uint64 align patch

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/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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

into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-rel

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/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough



storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...
  START_RECREQ is not enough

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

  Can only use mi_dynmap_file() if HAVE_MMAP is defined


storage/myisam/mi_open.c:
  Can only use mi_dynmap_file() if HAVE_MMAP is defined

  Calculate and output line count first to be
  compatible with older versions of Test::Harness


unittest/mysys/base64-t.c:
  Calculate and output line count first to be
  compatible with older versions of Test::Harness

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/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

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


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Make StartREDO come up as default in cluster log


ndb/src/common/debugger/EventLogger.cpp:
  Make StartREDO come up as default in cluster log

  make sure logPartPtr is correctly initialized


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix bug#26515
    make sure logPartPtr is correctly initialized

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

  fix overflow that could occur when have either lots of dd-data or very high dd-parallelism


storage/ndb/src/kernel/vm/RWPool.cpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page
storage/ndb/src/kernel/vm/RWPool.hpp:
  Add define for sizeof RWPage
storage/ndb/src/kernel/vm/WOPool.cpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page
storage/ndb/src/kernel/vm/WOPool.hpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page

Previous declaration in m_string.h

  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol


storage/archive/archive_reader.c:
  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol

  fix bug in extent/page allocation when *using* >1gb datafiles


storage/ndb/src/kernel/blocks/tsman.cpp:
  Make sure correct page id is returned even if on extent page 2

Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

- fixed error code
- added test program run in mysql-test-run bk version


mysql-test/ndb/ndbcluster.sh:
  Bug #26490 duplicate cluster error code
  - added check for duplicate error in mysql-test run
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/Makefile.am:
  Bug #26490 duplicate cluster error code
  - added test program for duplicate error messages
storage/ndb/src/ndbapi/ndberror.c:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/ndberror_check.c:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''

  write testcase for bug#26450...
  no solution however...


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  write testcase for bug#26450...
  no solution however...