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
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
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
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 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
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)
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''
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).
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
