Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

vinc13e · vinc13e · commit 2a29d3b58207 · 2023-06-07T18:36:59.000+01:00
Change-Id: Ief07012b9f477708797a68c381cb132e5af66521
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -1481,24 +1481,17 @@ MgmtSrvr::guess_master_node(SignalSender& ss)
     return guess;
 
   /**
-   * Check connected nodes based on dynamicId
+   * Check any connected node
    */
   node_id = 0;
   while(getNextNodeId(&node_id, NDB_MGM_NODE_TYPE_NDB))
   {
     trp_node node = ss.getNodeInfo(node_id);
-    if(node.m_state.dynamicId < min)
+    if (node.is_connected())
     {
-      if(node.is_connected())
-      {
-        min = node.m_state.dynamicId;
-        guess = node_id;
-      }
+      return node_id;
     }
   }
-  //found
-  if(min < UINT32_MAX)
-    return guess;
 
   return 0; // give up
 }

Original file line number	Diff line number	Diff line change
`@@ -1481,24 +1481,17 @@ MgmtSrvr::guess_master_node(SignalSender& ss)`
`1481`	`1481`	`return guess;`
`1482`	`1482`
`1483`	`1483`	`/**`
`1484`		`- * Check connected nodes based on dynamicId`
	`1484`	`+ * Check any connected node`
`1485`	`1485`	`*/`
`1486`	`1486`	`node_id = 0;`
`1487`	`1487`	`while(getNextNodeId(&node_id, NDB_MGM_NODE_TYPE_NDB))`
`1488`	`1488`	`{`
`1489`	`1489`	`trp_node node = ss.getNodeInfo(node_id);`
`1490`		`- if(node.m_state.dynamicId < min)`
	`1490`	`+ if (node.is_connected())`
`1491`	`1491`	`{`
`1492`		`- if(node.is_connected())`
`1493`		`- {`
`1494`		`- min = node.m_state.dynamicId;`
`1495`		`- guess = node_id;`
`1496`		`- }`
	`1492`	`+ return node_id;`
`1497`	`1493`	`}`
`1498`	`1494`	`}`
`1499`		`- //found`
`1500`		`- if(min < UINT32_MAX)`
`1501`		`- return guess;`
`1502`	`1495`
`1503`	`1496`	`return 0; // give up`
`1504`	`1497`	`}`