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


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

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


ndb/src/common/transporter/Packer.cpp:
  Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  merge
ndb/test/ndbapi/testNdbApi.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge

  Make sure that data can not e left lingering in receive buffer


ndb/src/common/transporter/Packer.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/src/common/transporter/TCP_Transporter.hpp:
  add new method for checking of data in receive buffer
ndb/src/common/transporter/TransporterRegistry.cpp:
  Make sure that 
  1) poll_TCP return true if any transporter has data in receiveBuffer
     (previously only if socket had data)
  2) performReceive executes signals if TCP transporter has data in receiveBuffer
     (previously only if data was recevied)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/test/ndbapi/testNdbApi.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

  disable "disable expand check" as it does not solve problems anyway


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  disable "disable expand check" as it does not solve problems anyway

  remove LCP files when dropping table


storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  add tup as user (for fsremove)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  remove each LCP file regardless if present or not

  set null bits on delete+insert


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  set null bits on delete+insert
storage/ndb/test/ndbapi/testBasic.cpp:
  set null bits on delete+insert
  20535
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

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

  redo extra verification code so that tupkeyref is reset just before tupkeyreq


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  redo extra verification code so that tupkeyref is reset just before tupkeyreq

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


mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/r/ndb_basic.result:
  SCCS merged

  bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
  this was however "normally" shadowed, but made LQH crash when LCP was about to start


mysql-test/r/ndb_basic.result:
  testcase
mysql-test/t/ndb_basic.test:
  testcase
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  make sure TUPKEYREF is not sent twice in case of "error" in interpreted program

  Increase size of memory channel


storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  increase size of memchannel to prevent crashes (for DD)

  fix release iterator


storage/ndb/src/kernel/vm/DynArr256.cpp:
  fix release
storage/ndb/src/kernel/vm/DynArr256.hpp:
  fix release

  fix commit triggers with DD but not using DD


storage/ndb/include/kernel/signaldata/TupCommit.hpp:
  add diskpage
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add diskpage
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  pass disk/nodisk down detachedtrigger-path
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  use TUPCOMMIT req for signaling diskpage back and forth
    so that I can init pointers (VM_TRACE) when from LQH
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  remove niclude
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  only derefence disk pointer if needed

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix forceVarPart also for ordered indexes
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add new table flag
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  set null ref in case of force var part
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  add varref also for force var part
storage/ndb/test/src/NDBT_Tables.cpp:
  "randomly" set forcevart on NDBT tables

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


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged

storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.
storage/ndb/src/ndbapi/ndberror.c:
  change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error

- put page of deleted row last in list

sql/ha_ndbcluster.cc:
  WL#1190 preparatory work needed for compatability with future online add column
  - make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
  New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
  New BitKeeper file ``mysql-test/t/ndb_row_format.test''

clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  SCCS merged

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


storage/ndb/test/tools/Makefile.am:
  merge

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


sql/ha_ndbcluster.cc:
  Auto merged

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.

In a certain code path the NDBD could loop infinitely in the lock queue.


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
  Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
  Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add test case.
storage/ndb/test/src/HugoOperations.cpp:
  Add optional hinting of TC for new transactions.

NdbTransaction::executeAsynch() was not implemented. Add implementation.


ndb/include/ndbapi/NdbTransaction.hpp:
  executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
  Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
  Add test case.
ndb/test/run-test/daily-basic-tests.txt:
  Add new test.

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


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

BitKeeper/etc/ignore:
  Added storage/ndb/test/tools/rep_latency storage/ndb/test/ndbapi/testIndexStat storage/ndb/test/ndbapi/testInterpreter storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2 storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1 storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index to the ignore list
storage/ndb/test/tools/rep_latency.cpp:
  New BitKeeper file ``storage/ndb/test/tools/rep_latency.cpp''

  add new functions for (easier) using NdbRestarter


storage/ndb/test/include/NdbRestarter.hpp:
  add new functions for (easier) using NdbRestarter

  add (auto) testcase for bug#28023


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#28023
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#28023

  fix COPY_ROWID return value


storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  fix COPY_ROWID return value

  make sure that copy tuple is released in all cases


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  make sure that copy tuple is released in all cases
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase