into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-ndb

Added accessor method to help out the NDB/Connectors.


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/include/ndbapi/NdbPool.hpp:
  Fixed header to reflect the implementation.
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Added accessor method to help out the NDB/Connectors.
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Added accessor method to help out the NDB/Connectors.

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

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


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

  decrease test time


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

  Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  add new error codes for bug#31525
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add new error codes for bug#31525
  fix bug, i.e include missing_2 in LCP
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#31525
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#31525

  Back porting NDB test case


mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test:
  Back porting NDB test case
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
  Back porting NDB test case

  Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
Many files:
  merged and cleanup of test cases


BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
  Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  merged and cleanup of test cases
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test:
  merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test:
  merged and cleanup of test cases
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  merged and cleanup of test cases

  Correcting test bug


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Correcting test bug
mysql-test/suite/rpl/t/rpl_bug31076.test:
  Correcting test bug

Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.


mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
  Updated test to run for both row and mixed replication testing
mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
  Updated results file
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB
mysql-test/suite/rpl/r/rpl_row_charset.result:
  Updated results file
mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
  Created a wrapper to test innodb storage engine as well
mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt:
  Option file to ensure innodb on master
mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt:
  Option file to ensure innodb on slave
mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
  New results file for innodb test case

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390

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


storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged

  (autotest tests)


storage/ndb/test/ndbapi/testDict.cpp:
  more test prg fixes
storage/ndb/test/ndbapi/testIndex.cpp:
  more test prg fixes
storage/ndb/test/ndbapi/test_event.cpp:
  more test prg fixes

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

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


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

  yet another test prg bug


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  yet another test prg bug

storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  merge

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Thread.cpp:
  Auto merged

  add list of pages being unmaped, so we can wait for it to be empty before dropping extents


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add list of pages being unmaped
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  add list of pages being unmaped
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wait for unmap pages

  (introduced by only updating extent pages after pageout)


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Fix disk scan (backup)

  (in test framework)


storage/ndb/test/src/NDBT_Thread.cpp:
  remove extra ;

    handle partially complete LCP better in SR


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove partially complete LCP from "node" when doign removeNodeFromTable
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove partially complete LCP from "node" when doign removeNodeFromTable

    - only update extent pages *after* flush of real page has been done
    - sync both create/drop of table into undolog (for disk tables)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  inform TUP which LCP to restore each fragment to
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  1) inform TUP which LCP to restore each fragment to
  2) inform TUP both before/after a page has been written
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  1) inform TUP which LCP to restore each fragment to
  2) inform TUP both before/after a page has been written
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  log both create/drop table
storage/ndb/src/kernel/blocks/lgman.cpp:
  let TUP know about all LCPs
storage/ndb/src/kernel/blocks/pgman.cpp:
  add "when" argument to disk_page_unmap_callback so that TUP gets informed both before and after page writeout
    so that extent pages can be updated only *after* page has been written
storage/ndb/src/kernel/blocks/tsman.cpp:
  remove lsn from update page free bits
  use wal for page vs extent relation
storage/ndb/src/kernel/blocks/tsman.hpp:
  remove lsn from update page free bits
  use wal for page vs extent relation

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


storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  (problem introduced by stew's timeout handling)


storage/ndb/src/cw/cpcd/APIService.cpp:
  Set usable timeout for atrt

  fix SR1 and SR2


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  fix SR1 and SR2

storage/ndb/src/ndbapi/ndberror.c:
  wl#29390 post-merge 5.0 to 5.1

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390


sql/ha_ndbcluster_cond.cc:
  Auto merged
mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  ul, add code (4294) in post-merge
storage/ndb/include/ndbapi/Ndb.hpp:
  SCCS merged

mysql-test/r/ndb_condition_pushdown.result:
  if ScanFilter is too large, abort or optionaly discard it
mysql-test/t/ndb_condition_pushdown.test:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/kernel/signaldata/ScanTab.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/Ndb.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/NdbScanFilter.hpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/ndbapi_limits.h:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanFilter.cpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanOperation.cpp:
  if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/ndberror.c:
  if ScanFilter is too large, abort or optionaly discard it
sql/ha_ndbcluster_cond.cc:
  if ScanFilter is too large, abort or optionaly discard it

Index: ndb/storage/ndb/src/mgmclient/CommandInterpreter.cpp
===================================================================


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  BUG#29509 ndb_mgm help needs to list the -a option for DN restart

Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
===================================================================


storage/ndb/src/common/debugger/EventLogger.cpp:
  BUG#25064 make formatting of key=value consistent in getTextTransReportCounters

Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
===================================================================


storage/ndb/src/common/debugger/EventLogger.cpp:
  BUG#25064 Remove newlines from cluster log

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

Close the event log on shutdown of mgmd (in stopEventLog())

Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================


ndb/src/mgmsrv/MgmtSrvr.cpp:
  BUG#29565 managment server can log entries multiple times after mgmd restart

into  mysql.com:/usr/clones/mysql-5.1-new-ndb


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

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

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


sql/log_event.cc:
  Auto merged

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

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged