• unknown's avatar
    Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 051c96f2
    unknown authored
    into  perch.ndb.mysql.com:/home/jonas/src/50-work
    
    
    ndb/src/common/transporter/Packer.cpp:
      Auto merged
    ndb/src/common/transporter/TCP_Transporter.hpp:
      Auto merged
    ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
      Auto merged
    ndb/src/common/transporter/TransporterRegistry.cpp:
      merge
    ndb/test/ndbapi/testNdbApi.cpp:
      merge
    ndb/test/run-test/daily-basic-tests.txt:
      merge
    051c96f2
daily-basic-tests.txt 10.5 KB