mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
7e5be0fefd
ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/vm/Configuration.hpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/mgmsrv/Services.hpp: Auto merged ndb/include/transporter/TransporterRegistry.hpp: Resolve merge conflict (change of parameter name) ndb/src/common/transporter/TransporterRegistry.cpp: Resolve merge conflict (change of parameter name) |
||
---|---|---|
.. | ||
ConfigRetriever.hpp | ||
IPCConfig.hpp | ||
MgmtErrorReporter.hpp |