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

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

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove accidently left in printout

  add even more tests


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add more tests...
storage/ndb/test/run-test/daily-basic-tests.txt:
  add more tests

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

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/test/src/HugoTransactions.cpp:
  merge

  (recommit for correct merge order)


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add error inserts
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add error insert
storage/ndb/src/kernel/blocks/pgman.cpp:
  add error inserts
storage/ndb/test/include/HugoTransactions.hpp:
  add 
  - loadTableStartFrom
  - scanUpdate with scanflags
  - fillTableStartFrom
storage/ndb/test/include/UtilTransactions.hpp:
  add
  - clearTable with scan flags
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add new testcases
storage/ndb/test/run-test/daily-basic-tests.txt:
  add new testcases
storage/ndb/test/src/HugoTransactions.cpp:
  add new functions
storage/ndb/test/src/UtilTransactions.cpp:
  add new functions

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

into  dator6.(none):/home/mikael/mysql_clones/bug30996

  Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c
ndb_rand.h:
  Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h


storage/ndb/include/util/ndb_rand.h:
  Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h
storage/ndb/src/common/util/ndb_rand.c:
  Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c

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


storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

timoOutLoopStartLab() checks if any transactions have been delayed
for so long that we are forced to perform some action (e.g. abort,
resend etc).

It is *MEANT* to (according to the comment):
> To avoid aborting both transactions in a deadlock detected by time-out
> we insert a random extra time-out of upto 630 ms by using the lowest
> six bits of the api connect reference.
> We spread it out from 0 to 630 ms if base time-out is larger than 3 sec,
> we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec,
> and otherwise we spread it out 310 ms.

The comment (as all do) lies.

the API connect reference is not very random, producing incredibly
predictable "random" numbers. This could lead to both txns being
aborted instead of just one.

Before:
timeout value: 123 3
timeout value: 122 2
timeout value: 122 2
timeout value: 122 2
timeout value: 123 3

After:
timeout value: 127 7
timeout value: 126 6
timeout value: 129 9
timeout value: 139 19
timeout value: 137 17
timeout value: 151 31
timeout value: 130 10
timeout value: 132 12

Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
===================================================================


ndb/src/common/util/Makefile.am:
  BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/include/util/ndb_rand.h:
  BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/src/common/util/ndb_rand.c:
  BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  BUG#30379 Better randomise time before retry in timeout check (DBTC)

into  dator6.(none):/home/mikael/mysql_clones/bug30996

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release

Second patch to initailize more uninitialized variables.


sql/log_event.cc:
  Intializing several uninitialized fields in the Table_map_log_event.

into  kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release

Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.


sql/log_event.cc:
  Initializing m_null_bits to null so that it can be detected that it
  was not initialized later.
mysql-test/suite/rpl/r/rpl_bug31076.result:
  New BitKeeper file ``mysql-test/suite/rpl/r/rpl_bug31076.result''
mysql-test/suite/rpl/t/rpl_bug31076.test:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_bug31076.test''

  Removed semicolon causing build syntax issues per pekka


storage/ndb/test/src/NDBT_Thread.cpp:
  Removed semicolon causing build syntax issues per pekka