Improve buddy high order allocation
  Make removeCommonArea O(1) instead of O(N)
  Add limit to left/right search


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Add info to buddy module test about 
  1) loops being made in buddy
  2) how much was allocated
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  1) make removeCommonArea o(1) - as list is (after fix) double linked anyway
  2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea
  3) add max loops in search left/right
  4) add more debug info

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


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge

- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in


mysql-test/ndb/ndb_config_2_node.ini:
  run mysql-test-run using ODirect
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  add new config parameter to choose ODirect
storage/ndb/include/ndb_global.h.in:
  specify alignment needed for odirect
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  read odirect config param
  open LCP and Backup datafiles with odirect if specified
  insert empty padding record if odirect is used
  allocate buffers aligned to be able to use odirect
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  odirect and padding options
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  add empty_record in file format
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  read odirect config and allocate aligned
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  correct debug printouts
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  read config params and open redo log files with odirect if set
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  aligned writing for odirect
  correct odirect open options with test+fallback if odirect fails
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  align + odirect check
storage/ndb/src/kernel/blocks/restore.cpp:
  restor block to ignore new lcp padding empty_record
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  alligend log buffer allocation for odirect
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  alligend log buffer allocation for odirect
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  new config param for odirect, default false
storage/ndb/tools/restore/Restore.cpp:
  ndb_restore to skip empty_record alignment padding in backup file

storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  add new configuration parameter TimeBetweenWatchDogCheckInitial
storage/ndb/include/portlib/NdbTick.h:
  enable timing code
storage/ndb/src/common/portlib/NdbTick.c:
  enable timing code
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  read watchdog timeout to set it after malloc
storage/ndb/src/kernel/vm/Configuration.cpp:
  read initial watchdog timeout and set it in the beginning
storage/ndb/src/kernel/vm/Configuration.hpp:
  read initial watchdog timeout and set it in the beginning
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  introduce new state for "action" malloc of memory
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  introduce new state for "action" malloc of memory
storage/ndb/src/kernel/vm/WatchDog.cpp:
  rewrite watchdog to check every 100ms for being stuch, but keep shutdown after 3 * interval
  for "action" == 9 (malloc)  keep old behavior and only output every interval
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  add new configuration parameter TimeBetweenWatchDogCheckInitial

  make sure to remove LCP files aswell if specifying --initial


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Add removal of LCP/X directories

  using new config variable FragmentLogFileSize (4M - 1G)


mysql-test/ndb/ndb_config_1_node.ini:
  change log file size (test)
mysql-test/ndb/ndb_config_2_node.ini:
  change log file size (test)
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  add new confif parameter
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  make logfile size configurable
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  make logfile size configurable
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  make logfile size configurable
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  add new config variable
storage/ndb/src/ndbapi/ndberror.c:
  update error message

storage/ndb/src/kernel/blocks/pgman.cpp:
  a) in one case pl_queue.remove(ptr) was not followed
  by state &= ~ Page_entry::ONQUEUE.
  
  b) when collecting initial hot entries have to remove
  from queue if somehow got there.
  
  b) is easy to get with large buffer cache (256M).
  a) or b) is probably cause of bug#20612.

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


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

- correction of merge error

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

- make sure we close the first file, before opening the next

storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp:
  Rename: storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp:
  Rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp -> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp:
  Rename: storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp

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

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

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


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

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


ndb/test/run-test/daily-basic-tests.txt:
  merge

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


storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  manual merge

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge

  so that othernodes dont get confused after having recevied status from master
  and then tries to update it self


ndb/src/kernel/blocks/ERROR_codes.txt:
  error 1001, delay node_failrep
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  error 1001, delay node_failrep
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

(part 2)

storage/ndb/src/kernel/blocks/pgman.cpp:
  Under heavy insert PGMAN can run out of page entries
  even when set to 100 times page cache entries.
  
  In this use pattern the extra entries remain idle
  on LIRS stack.  Only ONSTACK is set.  There is not
  enough activity to free them the normal way.
  
  A study of PGMAN / DBTUP behaviour is needed.
  
  This patch adds new sublist SL_IDLE.  When page entry
  pool is empty, an idle entry is released from SL_IDLE
  front if there is any.  Otherwise, we still crash.
  
  The factor above is set from 100 to 10 (still high).
storage/ndb/src/kernel/blocks/pgman.hpp:
  Under heavy insert PGMAN can run out of page entries
  even when set to 100 times page cache entries.
  
  In this use pattern the extra entries remain idle
  on LIRS stack.  Only ONSTACK is set.  There is not
  enough activity to free them the normal way.
  
  A study of PGMAN / DBTUP behaviour is needed.
  
  This patch adds new sublist SL_IDLE.  When page entry
  pool is empty, an idle entry is released from SL_IDLE
  front if there is any.  Otherwise, we still crash.
  
  The factor above is set from 100 to 10 (still high).

- correction, use recomputed _actual_ redobuffer

- parameterize on RedoBuffer

- change to scan in tup and disk order (if applicable)


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  tup scan for backup also, not only lcp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  choose disk order scan for disktables during backup
  + move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  add missing jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing jamEntry

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

  review comment 2, atleast 1 signal need for test prg


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  review comment, atleast 1 signal need

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


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  merge

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged

  review comment
  if some tcp-transporter has data, then do select with timeout 0


ndb/src/common/transporter/TransporterRegistry.cpp:
  review comment
  if some tcp-transporter has data, then do select with timeout 0

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