• unknown's avatar
    Merge mysql.com:/home/jonas/src/mysql-4.1-ndb · 0aee1b0a
    unknown authored
    into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
    
    
    ndb/src/kernel/blocks/dblqh/Dblqh.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/blocks/dblqh/DblqhMain.cpp:
      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/Ndbif.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/testDict.cpp:
      Auto merged
    ndb/test/ndbapi/testSystemRestart.cpp:
      Auto merged
    ndb/test/ndbapi/testTimeout.cpp:
      Auto merged
    ndb/test/src/Makefile_old:
      Auto merged
    0aee1b0a
Makefile_old 595 Bytes