BitKeeper/etc/logging_ok:
auto-union
ndb/include/kernel/NodeState.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/include/util/Bitmask.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CpcClient.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/include/NDBT_Table.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/run-test/main.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/NDBT_Tables.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/space/pekka/ndb/version/my41-tux
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/include/kernel/GlobalSignalNumbers.h:
Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
Removed SCAN_TABINFO
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
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
Still known bugs :-(
ndb/include/kernel/signaldata/ScanTab.hpp:
Add close flag
ndb/include/ndbapi/NdbConnection.hpp:
Moved mehtod outside
ndb/include/ndbapi/NdbScanOperation.hpp:
Removed err code from
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Updated printer
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
New error inserts for SCAN
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
Don't send empty TRANSID_AI's
ndb/src/ndbapi/NdbConnectionScan.cpp:
Update error handling of scan
ndb/src/ndbapi/NdbScanOperation.cpp:
Update error handling of scan
ndb/src/ndbapi/Ndbif.cpp:
Update error handling of scan