manual merge
sql/ha_ndbcluster.cc: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged
Showing
Please register or sign in to comment