ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Made releaseCompletedOpertions private and introduced
NdbConnection::restart instead. This methods basically check a bunch of
status flags before calling releaseCompletedOperations
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Introduced MARKRE_TRACE
Fixed bug on not releasing marker at execABORT
ndb/src/ndbapi/NdbConnection.cpp:
Made releaseCompletedOpertions private and introduced
NdbConnection::restart instead. This methods basically check a bunch of
status flags before calling releaseCompletedOperations
ndb/src/ndbapi/Ndbif.cpp:
Use MARKER_TRACE
ndb/test/src/HugoTransactions.cpp:
Use restart instead of releaseCompletedOperations
ndb/test/src/UtilTransactions.cpp:
Use restart instead of releaseCompletedOperations
ndb/tools/delete_all.cpp:
Use restart instead of releaseCompletedOperations
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
Auto merged
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/kernel/Main.cpp:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/Makefile_old:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationScan.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationSearch.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.cpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.hpp:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/tools/ndbsql.cpp:
Auto merged