Merge

mysql-test/mysql-test-run.pl:
  Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge

1 files changed, 9 insertions, 0 deletions

diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index 4ea7afdd3b8..94ae55e0f51 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -1729,6 +1729,15 @@ ndb_mgm_destroy_configuration(struct ndb_mgm_configuration *cfg)
 
 extern "C"
 int
+ndb_mgm_set_configuration_nodeid(NdbMgmHandle handle, int nodeid)
+{
+  CHECK_HANDLE(handle, -1);
+  handle->cfg._ownNodeId= nodeid;
+  return 0;
+}
+
+extern "C"
+int
 ndb_mgm_get_configuration_nodeid(NdbMgmHandle handle)
 {
   CHECK_HANDLE(handle, 0);