ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/testBackup.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
increase wait completed timeout to 48 hours
ndb/include/kernel/signaldata/BackupImpl.hpp:
Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Init own version
ndb/src/mgmapi/mgmapi.cpp:
bug#9960 - ndb backup
increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
Handle node failures activly
(mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
Handle node failures activly
(mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
Handle node failures activly
(mainly for backup...)
ndb/src/ndbapi/ndberror.c:
new error codes
ndb/test/ndbapi/testBackup.cpp:
fix return codes
ndb/test/run-test/daily-basic-tests.txt:
Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
fix error codes
introduce checking of backup resources after each test
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/test/ndbapi/testIndex.cpp:
Auto merged
Make BUILDINDX RF_LOCAL aware
ndb/src/ndbapi/Ndbif.cpp:
allow TCKEY_FAILREF w/ invalid magic number also when NDB_NODROPPED_SIGNAL
ndb/test/ndbapi/testIndex.cpp:
Run only 1 update thread during NFNR2_O
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/Makefile.am:
divide schemafile in blocks to allow unlimited # objects
ndb/include/debugger/SignalLoggerManager.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/include/kernel/ndb_limits.h:
divide schemafile in blocks to allow unlimited # objects
ndb/src/common/debugger/SignalLoggerManager.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/test/ndbapi/testDict.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
fix readTuples signature
ndb/include/ndbapi/NdbScanOperation.hpp:
fix readTuples signature
ndb/src/ndbapi/NdbScanOperation.cpp:
fix readTuples signature
ndb/test/include/HugoTransactions.hpp:
fix readTuples signature
ndb/test/ndbapi/testScanPerf.cpp:
fix readTuples signature
ndb/test/src/HugoOperations.cpp:
fix readTuples signature
ndb/test/src/HugoTransactions.cpp:
fix readTuples signature
ndb/test/ndbapi/testOIBasic.cpp:
fix readTuples signature
ndb/include/kernel/signaldata/AccScan.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/NextScan.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanFrag.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanTab.hpp:
TUP scan for testing in 5.0
ndb/src/common/debugger/signaldata/ScanTab.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Makefile.am:
TUP scan for testing in 5.0
ndb/test/ndbapi/testScan.cpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/CreateEvnt.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
ndb/include/ndbapi/NdbConnection.hpp:
Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
Testcase for bug#8853
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/ndb_index_ordered.result:
fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
fix new decimal mysql vs. ndb
