into mysql.com:/home/kent/bk/mysql-5.0
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
bdb/dist/gen_rec.awk:
Auto merged
libmysql_r/Makefile.am:
Auto merged
ndb/config/type_ndbapitools.mk.am:
Auto merged
ndb/src/kernel/Makefile.am:
Auto merged
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Still leakage, make sure all unlinked operations are put back so they will be release
(on failing blob operations, when AO_IgnoreError)
ndb/src/ndbapi/NdbConnection.cpp:
Still leakage, make sure all unlinked operations are put back so they will be release
bugs.
ndb/include/util/UtilBuffer.hpp:
Fix accessing memory after free(), if called with source and destination
pointer the same (which should not really happen...).
Fixes a problem in ndb_restore.
ndb/src/common/util/SimpleProperties.cpp:
Fix typo in check of maxValue.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
SCCS merged
Fix some too small buffers in backup
ndb/include/kernel/ndb_limits.h:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
Make sure postExecute is not run for blobs if AO_IgnoreError
ndb/src/ndbapi/NdbConnection.cpp:
If AO_IgnoreError, error codes arent always set on individual operations, making postExecute impossible
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
use pool of lock ops (like tupscan) instead of array of 992
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
use pool of lock ops (like tupscan) instead of array of 992
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
use pool of lock ops (like tupscan) instead of array of 992
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
use pool of lock ops (like tupscan) instead of array of 992
ndb/src/kernel/vm/DLFifoList.hpp:
add Head::isEmpty
1) Handle not started nodes in dump 1000 (check for division by 0)
2) Make sure to init variables in constructor
ndb/src/common/debugger/EventLogger.cpp:
Handle not started nodes
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Init variables in constructor
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Handle not started nodes
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Init variables in constructor
Handle not started nodes
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1
ndb/src/ndbapi/NdbScanOperation.cpp:
missing if for bug#21941
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
merge
Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd
Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self"
ndb/src/kernel/blocks/ERROR_codes.txt:
Add error insert for dealying of copy sysfileData
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
1) Add error insert for delaying of sysfileData
2) Change to that master is _not_ copying sysfileData from COPY_GCIREQ
as it might be updating it while COPY_GCIREQ is "in the fly"
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
fix bug in handling of inactive timeout for scan, when all is delivered
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) set timeout if all scans are at api
2) Use c_appl_timeout_value when getting scan timeout
ndb/test/ndbapi/testTimeout.cpp:
test program
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/test/ndbapi/testOIBasic.cpp:
test -case h for parallel ordered update (bug#20446)
ndb/test/run-test/daily-basic-tests.txt:
test -case h for parallel ordered update (bug#20446)
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
remove stupid Data abstraction which is not completely transparent
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
remove stupid Data abstraction which is not completely transparent
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
remove stupid Data abstraction which is not completely transparent
Add checking of REDO to earlier during SR
so take-over of node can be performed
if it can't be restarted using logs
(which btw is really weird...as it _should_ be able to use logs of other node in node group)
Otherwise cluster could be started and 1 fragment on one node could not have been restored
Making the cluster inconsisten, VERY BAD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Break-out methods which searches for REDO for a fragment, so it can be used earlier during SR
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add checking of REDO to earlier during SR
so take-over of node can be performed
if it can't be restarted using logs
(which btw is really weird...as it _should_ be able to use logs of other node in node group)
