correct related sourcecode after merge from 5.0


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  correct something to ensure only related sourcecode are merged

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb


storage/ndb/include/debugger/EventLogger.hpp:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged

ndb/include/debugger/EventLogger.hpp:
  add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
  add a printLogEvent() function to print log event;
  filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
  filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
  and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
  add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
  testcase result for ndb_backup_print
  produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
  add testcase for ndb_mgm -e "start backup", check outupt format

storage/ndb/src/mgmclient/main.cpp:
  fix build issues only caught by pb (mgm client history related)

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  add knielsen as MAINTAINER of NDBAPI NdbRecord examples

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  Add MAINTAINERS file for NDB

Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================


storage/ndb/tools/ndb_error_reporter:
  BUG#29074 preserve file timestamps in ndb_error_reporter

Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
since global dict cache rewrite. This test should probably be enabled then.

Index: ndb-work/mysql-test/t/ndb_basic.test
===================================================================


mysql-test/r/ndb_basic.result:
  Enable test for (Closed) bug 16445
mysql-test/t/ndb_basic.test:
  Enable test for (Closed) bug 16445

Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
===================================================================


storage/ndb/src/mgmclient/main.cpp:
  BUG#29073 Store history for ndb_mgm

This is somewhat related to BUG#26675 (ndb_connectstring not reported
in show global variables)

Index: ndb-work/mysql-test/r/ndb_basic.result
===================================================================


mysql-test/r/ndb_basic.result:
  Add tests for ndb variables (related to BUG#26675)
mysql-test/t/ndb_basic.test:
  Add tests for ndb variables (related to BUG#26675)

Index: ndb-work/mysql-test/t/disabled.def
===================================================================


mysql-test/t/disabled.def:
  Disable mysql_upgrade test (Bug#28560)

correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================


storage/ndb/src/mgmapi/mgmapi.cpp:
  BUG#29063 mgmapi: connect timeout set incorrectly

Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================


storage/ndb/test/ndbapi/testMgm.cpp:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
storage/ndb/test/run-test/daily-basic-tests.txt:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly

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


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

- add config param to have better behavior with large tables

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


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  merge

  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

storage/ndb/src/ndbapi/ndb_internal.hpp:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''

storage/ndb/include/ndbapi/NdbOperation.hpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.
storage/ndb/src/ndbapi/NdbBlob.cpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.
storage/ndb/src/ndbapi/NdbOperation.cpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.

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


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  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/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

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

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


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

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


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

  update dl145a config for autotest


storage/ndb/test/run-test/conf-dl145a.cnf:
  update dl145a config for autotest

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


mysql-test/ndb/ndb_config_1_node.ini:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  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/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

  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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

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-single-user


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/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  manual merge

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-single-user


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp:
  Auto merged

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  manual merge