• unknown's avatar
    Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 3aeee552
    unknown authored
    into  perch.ndb.mysql.com:/home/jonas/src/51-work
    
    
    support-files/mysql.spec.sh:
      Auto merged
    storage/ndb/include/util/SocketServer.hpp:
      Auto merged
    storage/ndb/src/common/transporter/Transporter.cpp:
      Auto merged
    storage/ndb/src/common/util/SocketServer.cpp:
      Auto merged
    storage/ndb/src/mgmsrv/Services.cpp:
      Auto merged
    3aeee552
SocketServer.hpp 3.3 KB