into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
ndb/test/ndbapi/testNodeRestart.cpp:
manual merge
so that othernodes dont get confused after having recevied status from master
and then tries to update it self
ndb/src/kernel/blocks/ERROR_codes.txt:
error 1001, delay node_failrep
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
error 1001, delay node_failrep
ndb/test/ndbapi/testNodeRestart.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
testcase
review comment
if some tcp-transporter has data, then do select with timeout 0
ndb/src/common/transporter/TransporterRegistry.cpp:
review comment
if some tcp-transporter has data, then do select with timeout 0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/common/transporter/Packer.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/common/transporter/Packer.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/test/ndbapi/testNdbApi.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
Make sure that data can not e left lingering in receive buffer
ndb/src/common/transporter/Packer.cpp:
test, make MAX_RECEIVED_SIGNALS an variable
ndb/src/common/transporter/TCP_Transporter.hpp:
add new method for checking of data in receive buffer
ndb/src/common/transporter/TransporterRegistry.cpp:
Make sure that
1) poll_TCP return true if any transporter has data in receiveBuffer
(previously only if socket had data)
2) performReceive executes signals if TCP transporter has data in receiveBuffer
(previously only if data was recevied)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
test, make MAX_RECEIVED_SIGNALS an variable
ndb/test/ndbapi/testNdbApi.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
testcase
redo extra verification code so that tupkeyref is reset just before tupkeyreq
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
redo extra verification code so that tupkeyref is reset just before tupkeyreq
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
this was however "normally" shadowed, but made LQH crash when LCP was about to start
mysql-test/r/ndb_basic.result:
testcase
mysql-test/t/ndb_basic.test:
testcase
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
make sure TUPKEYREF is not sent twice in case of "error" in interpreted program
into trift-lap.fambruehe:/MySQL/M50/push-5.0
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
Manual merge: Use the standard text.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
NdbTransaction::executeAsynch() was not implemented. Add implementation.
ndb/include/ndbapi/NdbTransaction.hpp:
executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
Add test case.
ndb/test/run-test/daily-basic-tests.txt:
Add new test.
The old blob implementation had code that attempted to upgrade the lock mode for
LM_CommittedRead operations, but it did not work properly as it did not recompute
the operation flags.
As a consequence, reading a blob with LM_CommittedRead could return inconsistent
data, with different part of the read data being from different commits done by
other transactions.
The fix is to correctly recompute all necessary flags when upgrading lock mode.
ndb/include/kernel/signaldata/ScanTab.hpp:
Remove assumption in setXXX() methods that old value is zero, needed to allow blob
code to upgrade lock mode.
Fix spelling and commments.
ndb/include/ndbapi/NdbOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/include/ndbapi/NdbScanOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbBlob.cpp:
Fix upgrading lock mode (old code had no effect).
ndb/src/ndbapi/NdbOperationDefine.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbScanOperation.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/test/ndbapi/testBlobs.cpp:
Add testcase.
ndb/test/run-test/daily-basic-tests.txt:
Enable bug tests for auto test.
Bug #27710 Creating unique index fails during single user mode
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Bug #27710 Creating unique index fails during single user mode
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
