• unknown's avatar
    Merge · da2ae189
    unknown authored
    
    ndb/include/ndbapi/Ndb.hpp:
      Auto merged
    ndb/include/ndbapi/NdbConnection.hpp:
      Auto merged
    ndb/include/ndbapi/NdbIndexOperation.hpp:
      Auto merged
    ndb/Epilogue.mk_old:
      Auto merged
    ndb/src/common/debugger/signaldata/Makefile_old:
      Auto merged
    ndb/src/common/mgmcommon/Makefile_old:
      Auto merged
    ndb/src/common/util/Makefile_old:
      Auto merged
    ndb/src/kernel/Makefile_old:
      Auto merged
    ndb/src/kernel/ndb-main/Main.cpp:
      Auto merged
    ndb/src/kernel/ndb-main/Makefile_old:
      Auto merged
    ndb/src/kernel/vm/Makefile_old:
      Auto merged
    ndb/src/mgmapi/Makefile_old:
      Auto merged
    ndb/src/mgmclient/Makefile_old:
      Auto merged
    ndb/src/mgmsrv/Makefile_old:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.cpp:
      Auto merged
    ndb/src/ndbapi/ClusterMgr.cpp:
      Auto merged
    ndb/src/ndbapi/Makefile_old:
      Auto merged
    ndb/src/ndbapi/Ndb.cpp:
      Auto merged
    ndb/src/ndbapi/NdbApiSignal.cpp:
      Auto merged
    ndb/src/ndbapi/NdbConnection.cpp:
      Auto merged
    ndb/src/ndbapi/NdbDictionaryImpl.cpp:
      Auto merged
    ndb/src/ndbapi/NdbEventOperationImpl.cpp:
      Auto merged
    ndb/src/ndbapi/NdbIndexOperation.cpp:
      Auto merged
    ndb/src/ndbapi/NdbOperation.cpp:
      Auto merged
    ndb/src/ndbapi/NdbOperationDefine.cpp:
      Auto merged
    ndb/src/ndbapi/NdbOperationExec.cpp:
      Auto merged
    ndb/src/ndbapi/NdbOperationInt.cpp:
      Auto merged
    ndb/src/ndbapi/Ndbinit.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.hpp:
      Auto merged
    ndb/test/ndbapi/Makefile_old:
      Auto merged
    ndb/test/ndbapi/ScanFunctions.hpp:
      Auto merged
    ndb/test/ndbapi/ScanInterpretTest.hpp:
      Auto merged
    ndb/test/ndbapi/testDataBuffers.cpp:
      Auto merged
    ndb/test/ndbapi/old_dirs/testBackup/Makefile:
      Auto merged
    ndb/test/ndbapi/old_dirs/testGrep/Makefile:
      Auto merged
    ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
      Auto merged
    ndb/test/ndbapi/testDict.cpp:
      Auto merged
    ndb/test/ndbapi/testGrep.cpp:
      Auto merged
    ndb/test/ndbapi/testIndex.cpp:
      Auto merged
    ndb/test/ndbapi/testOIBasic.cpp:
      Auto merged
    ndb/test/ndbapi/testSystemRestart.cpp:
      Auto merged
    ndb/test/ndbapi/testTimeout.cpp:
      Auto merged
    ndb/test/src/Makefile_old:
      Auto merged
    ndb/test/src/UtilTransactions.cpp:
      Auto merged
    ndb/test/tools/create_index.cpp:
      Auto merged
    ndb/tools/select_all.cpp:
      Auto merged
    da2ae189
testDict.cpp 42.5 KB