• unknown's avatar
    Merge · 51229d4b
    unknown authored
    
    mysql-test/t/ctype_utf8.test:
      Auto merged
    ndb/src/common/mgmcommon/ConfigRetriever.cpp:
      Auto merged
    ndb/src/common/transporter/Transporter.hpp:
      Auto merged
    ndb/src/common/transporter/TransporterRegistry.cpp:
      Auto merged
    ndb/src/mgmclient/CommandInterpreter.cpp:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.cpp:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.hpp:
      Auto merged
    ndb/src/mgmsrv/Services.cpp:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    support-files/mysql.spec.sh:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    ndb/include/transporter/TransporterRegistry.hpp:
      SCCS merged
    ndb/src/common/transporter/Transporter.cpp:
      SCCS merged
    51229d4b
Transporter.hpp 4.1 KB