ndb/src/kernel/blocks/ERROR_codes.txt:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
DbtupTabDesMan: add merge with left buddies
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
ndb/test/ndbapi/testNodeRestart.cpp:
Fix testNodeRestart -n DuringLCP and others
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
ndb/src/ndbapi/NdbBlobImpl.hpp:
distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
fix 4269 -> 4270
ndb/test/ndbapi/testBlobs.cpp:
test lock upgrade, test 4275 errors
ndb/include/ndbapi/NdbScanOperation.hpp:
fix comment
ndb/include/ndbapi/NdbBlob.hpp:
upgrade LM_CommittedRead to LM_Read
check if write allowed (new error 4275)
dont invalidate blob state on error (just general principle)
ndb/src/ndbapi/NdbBlob.cpp:
upgrade LM_CommittedRead to LM_Read
check if write allowed (new error 4275)
dont invalidate blob state on error (just general principle)
ndb/src/kernel/blocks/dbdict/DictLock.txt:
NR signals
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
call removeStaleDictLocks at right place, comment why it works
more checks, better logging
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
call removeStaleDictLocks at right place, comment why it works
more checks, better logging
ndb/include/kernel/signaldata/DictLock.hpp:
2 more REFs
ndb/include/ndb_version.h.in:
DICT LOCK appeared in 5.0.23
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
DICT LOCK rolling upgrade from version < 5.0.23
ndb/src/kernel/blocks/ERROR_codes.txt:
more DICT LOCK related testing
ndb/test/ndbapi/testDict.cpp:
more DICT LOCK related testing
ndb/src/kernel/main.cpp:
signal log from start (#if 0-ed)
ndb/test/ndbapi/testDict.cpp:
test NF/NR + dict ops
ndb/src/kernel/vm/DLFifoList.hpp:
add hasPrev
ndb/src/kernel/vm/pc.hpp:
ERROR_INSERTED_CLEAR(x) test and clear if set
ndb/src/common/debugger/SignalLoggerManager.cpp:
block no fix
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
spelling
ndb/include/kernel/GlobalSignalNumbers.h:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/AlterTable.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/CreateTable.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/DictLock.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/DropTable.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/common/debugger/signaldata/SignalNames.cpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/ERROR_codes.txt:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/ndbapi/ndberror.c:
locking of master DICT against schema ops, used by slave DIH under NR
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
Dont be too aggressive in Dbtc::nodeFailCheckTransaction
let it timeout by 1, so that it does not assert that it has waited too long
old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.
ndb/src/kernel/blocks/ERROR_codes.txt:
error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
2 new error inserts
7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
autotest
into mysql.com:/space/pekka/ndb/version/my50-bug14509
ndb/src/ndbapi/DictCache.cpp:
Auto merged
ndb/src/ndbapi/DictCache.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
make auto-incr methods return int 0/-1
ndb/src/ndbapi/Ndb.cpp:
make auto-incr methods return int 0/-1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
make auto-incr methods return int 0/-1
ndb/test/ndbapi/testDict.cpp:
make auto-incr methods return int 0/-1
ndb/tools/restore/consumer_restore.cpp:
make auto-incr methods return int 0/-1
sql/ha_ndbcluster.cc:
make auto-incr methods return int 0/-1
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
mysql-test/t/rpl_temporary.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/Makefile.am:
enable testInterpreter
ndb/test/ndbapi/testInterpreter.cpp:
add test case Bug19537
the bug fix also fixed IncValue64 for whatever reason..
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32
into mysql.com:/space/pekka/ndb/version/my50
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/tools/delete_all.cpp:
nuts
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/NdbRestarts.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
merge
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
merge
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
merge
add testprg for SR case aswell
ndb/test/ndbapi/testNodeRestart.cpp:
Test also partitioned start during SR
ndb/test/run-test/daily-basic-tests.txt:
Test also partitioned start during SR
post weeked fixes :-)
change impl. to use READ_NODESREQ to query state of other qmgr(partition)
this as it has no (current) side effects, so that it's possible only to kill
starting cluster (if one started and one starting)
ndb/include/kernel/signaldata/FailRep.hpp:
Add paritioned FAIL_REP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/test/ndbapi/testNodeRestart.cpp:
Require that only starting cluster dies
this also impl. gcp safe multi node shutdown
1) block gcp
2) wait for ongoing gcp
3) inform all stopping QMGR's (so that they don't start with error handler)
4) wait for all QMGR's to reply
5) broadcast failrep for stopping nodes
6) (if !master died) unblock gcp
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/FailRep.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/StopReq.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/test/ndbapi/testNodeRestart.cpp:
test program for bug#18612
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
ndb/test/src/NdbRestarts.cpp:
Auto merged
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
minor fixes in test programs
ndb/src/kernel/blocks/ERROR_codes.txt:
Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
Fix test program
into perch.ndb.mysql.com:/home/jonas/src/50-work
mysql-test/lib/mtr_timer.pl:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
ndb/src/ndbapi/Ndbif.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
ndb/test/ndbapi/testTimeout.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
ndb/tools/desc.cpp:
merge
Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove dumping of LCP info during NF
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug18414
ndb/test/ndbapi/testTimeout.cpp:
Fix error code checking
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for bug18414
Partial system restart, can not try to start with higher GCI that own
even if knowing about a higher number
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Add new dump for setting time between gcp
ndb/include/kernel/signaldata/StartPerm.hpp:
Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error insert
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix so that we don't try to restart to a too new GCI when doing a partial start
Add new error code when this node later tries to join
ndb/test/include/NdbRestarter.hpp:
Add new method for selecting random node
ndb/test/ndbapi/testSystemRestart.cpp:
Add new testcase for bug#18385
ndb/test/run-test/daily-basic-tests.txt:
Run test in daily-basic
ndb/test/src/NdbRestarter.cpp:
Add new method for selecting random node
Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
When getting 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/NdbConnection.cpp:
Use variable for WAITFOR_RESPONSE_TIMEOUT
ndb/src/ndbapi/Ndbif.cpp:
Use variable timeout for waitfor,
when receiving 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/TransporterFacade.cpp:
Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/src/ndbapi/TransporterFacade.hpp:
Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/test/ndbapi/testTimeout.cpp:
Add testcase for 4012
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for 4012
dont't allow node to join cluster until all nodes has completed failure handling
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override.
But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later)
ndb/test/ndbapi/testNodeRestart.cpp:
testcase for bug#16772
ndb/test/run-test/daily-basic-tests.txt:
Run test in basic suite
ndb/test/ndbapi/testBlobs.cpp:
do batched deletes + list commit across open cursor test cases
ndb/tools/delete_all.cpp:
if blobs, no commit across open cursor (single trans)
cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
test_event_merge v5.0
