• unknown's avatar
    merge · bd877f17
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    ndb/docs/wl2077.txt:
      Auto merged
    ndb/include/Makefile.am:
      Auto merged
    ndb/include/ndbapi/NdbTransaction.hpp:
      Auto merged
    ndb/src/common/debugger/EventLogger.cpp:
      Auto merged
    ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
      Auto merged
    ndb/src/common/logger/Logger.cpp:
      Auto merged
    ndb/src/common/mgmcommon/ConfigRetriever.cpp:
      Auto merged
    ndb/src/common/util/Makefile.am:
      Auto merged
    ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbacc/Makefile.am:
      Auto merged
    ndb/src/kernel/main.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
      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/DbtcMain.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
      Auto merged
    ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
      Auto merged
    ndb/src/kernel/vm/Configuration.cpp:
      Auto merged
    ndb/src/kernel/vm/Configuration.hpp:
      Auto merged
    ndb/src/mgmapi/mgmapi.cpp:
      Auto merged
    ndb/src/mgmsrv/CommandInterpreter.cpp:
      Auto merged
    ndb/src/mgmsrv/InitConfigFileParser.cpp:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.cpp:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.hpp:
      Auto merged
    ndb/src/mgmsrv/Services.cpp:
      Auto merged
    ndb/src/mgmsrv/Services.hpp:
      Auto merged
    ndb/src/mgmsrv/main.cpp:
      Auto merged
    ndb/src/ndbapi/NdbBlob.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/NdbOperationExec.cpp:
      Auto merged
    ndb/src/ndbapi/NdbReceiver.cpp:
      Auto merged
    ndb/src/ndbapi/NdbScanOperation.cpp:
      Auto merged
    ndb/src/ndbapi/NdbTransaction.cpp:
      Auto merged
    ndb/src/ndbapi/Ndbif.cpp:
      Auto merged
    ndb/src/ndbapi/Ndbinit.cpp:
      Auto merged
    ndb/src/ndbapi/Ndblist.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.hpp:
      Auto merged
    ndb/src/ndbapi/ndberror.c:
      Auto merged
    ndb/test/ndbapi/Makefile.am:
      Auto merged
    ndb/test/ndbapi/testDict.cpp:
      Auto merged
    ndb/test/ndbapi/testNdbApi.cpp:
      Auto merged
    ndb/test/src/NdbRestarter.cpp:
      Auto merged
    ndb/test/tools/Makefile.am:
      Auto merged
    ndb/tools/Makefile.am:
      Auto merged
    ndb/tools/delete_all.cpp:
      Auto merged
    ndb/tools/desc.cpp:
      Auto merged
    ndb/tools/select_all.cpp:
      Auto merged
    ndb/tools/select_count.cpp:
      Auto merged
    scripts/make_win_src_distribution.sh:
      Auto merged
    sql/ha_ndbcluster.h:
      Auto merged
    bd877f17
NdbTransaction.cpp 66.9 KB