• unknown's avatar
    merge · ff51fe45
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    configure.in:
      Auto merged
    ndb/include/Makefile.am:
      Auto merged
    ndb/include/mgmapi/mgmapi.h:
      Auto merged
    ndb/include/ndbapi/NdbConnection.hpp:
      Auto merged
    ndb/include/ndbapi/NdbDictionary.hpp:
      Auto merged
    ndb/src/common/debugger/EventLogger.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/common/util/version.c:
      Auto merged
    ndb/src/kernel/blocks/dbacc/Makefile.am:
      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/Dbdih.hpp:
      Auto merged
    ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    ndb/src/kernel/main.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Auto merged
    ndb/src/kernel/vm/Configuration.cpp:
      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/Makefile.am:
      Auto merged
    ndb/src/ndbapi/NdbBlob.cpp:
      Auto merged
    ndb/src/ndbapi/NdbConnection.cpp:
      Auto merged
    ndb/src/ndbapi/NdbDictionaryImpl.hpp:
      Auto merged
    ndb/src/ndbapi/ndberror.c:
      Auto merged
    ndb/test/ndbapi/Makefile.am:
      Auto merged
    ndb/test/tools/Makefile.am:
      Auto merged
    ndb/tools/Makefile.am:
      Auto merged
    scripts/make_win_src_distribution.sh:
      Auto merged
    ff51fe45
Makefile.am 5.36 KB