into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/suite/ndb/r/ndb_update.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
sql/ha_ndbcluster.h:
  Merge

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

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

The optimizer sets index traversal in reverse order only if there are 
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if 
all the parts of the secondary key are compared to a constant.

Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.


mysql-test/include/mix1.inc:
  Bug #31001: test case
mysql-test/r/innodb_mysql.result:
  Bug #31001: test case
sql/sql_select.cc:
  Bug #31001: 
   - account for the case when all the primary key parts are compared
     to a constant.
   - force test_if_skip_sort_order to go backwards over the key even 
     when the number of keyparts used is the same as the number of
     keyparts equal to a constant. (because of the primary key
     suffix).

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

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

    Copy a fix by jperkin for bug#30624 into the 5.1.22 build tree.


scripts/mysqld_safe.sh:
  Copy a fix by jperkin for bug#30624 into the 5.1.22 build tree.

Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table


mysql-test/suite/ndb/r/ndb_lock_table.result:
  Added a new test case for bug30996
mysql-test/suite/ndb/t/ndb_lock_table.test:
  Added a new test case for bug30996
sql/ha_ndbcluster.cc:
  Moved out a lot of code into functions from external_lock and
  start_stmt
  Fixed a crashing bug at memory alloc failure
  Merged the stmt and all variables into one trans variable
  Always register start of statement as according to the
  interface of the handlers.
  Also register for start of transaction when not statement commit
  == not autocommit AND no begin - commit ongoing
  Now that we registered in a proper manner we also needed to handle
  the commit call when end of statement and transaction is ongoing
  Added start_stmt_count to know when we have start of statement
  for first table
sql/ha_ndbcluster.h:
  New functions and merged variables

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.cc:
  Auto merged

mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
  Fix test results for pushbuild
storage/innobase/handler/ha_innodb.cc:
  resolve a VSC++ typecast compile warning.

remove 'drop database' from new tests.


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
  remove "DROP DATABASE test"
storage/innobase/handler/ha_innodb.cc:
  undo unneccessary edits.

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj

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