• unknown's avatar
    Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · ee1969d2
    unknown authored
    into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
    
    
    storage/ndb/include/mgmapi/mgmapi.h:
      Auto merged
    storage/ndb/src/mgmapi/mgmapi.cpp:
      Auto merged
    storage/ndb/src/mgmclient/CommandInterpreter.cpp:
      Auto merged
    storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
      Auto merged
    storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
      Auto merged
    storage/ndb/src/mgmsrv/Services.cpp:
      Auto merged
    storage/ndb/src/mgmsrv/Services.hpp:
      Auto merged
    ee1969d2
mgmapi.h 36.9 KB