Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Maitrayi Sabaratnam · Maitrayi Sabaratnam · commit d27630a73e81 · 2021-07-14T14:20:03.000+02:00
diff --git a/storage/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp
@@ -1048,14 +1048,18 @@ MgmApiSession::getStatus(Parser<MgmApiSession>::Context &,
   int noOfNodes = 0;
   BaseString typestring;
 
-  enum ndb_mgm_node_type types[10];
+  enum ndb_mgm_node_type types[NDB_MGM_NODE_TYPE_MAX+1];
   if (args.get("types", typestring))
   {
     Vector<BaseString> tmp;
     typestring.split(tmp, " ");
-    for (i = 0; i < tmp.size(); i++)
+    for (i = 0; i < tmp.size() && i < NDB_MGM_NODE_TYPE_MAX; i++)
     {
       types[i] = ndb_mgm_match_node_type(tmp[i].c_str());
+      if (types[i] == NDB_MGM_NODE_TYPE_UNKNOWN) {
+        // Either end of typestring or junk found
+        break;
+      }
     }
     types[i] = NDB_MGM_NODE_TYPE_UNKNOWN;    
   }

Original file line number	Diff line number	Diff line change
`@@ -1048,14 +1048,18 @@ MgmApiSession::getStatus(Parser<MgmApiSession>::Context &,`
`1048`	`1048`	`int noOfNodes = 0;`
`1049`	`1049`	`BaseString typestring;`
`1050`	`1050`
`1051`		`- enum ndb_mgm_node_type types[10];`
	`1051`	`+ enum ndb_mgm_node_type types[NDB_MGM_NODE_TYPE_MAX+1];`
`1052`	`1052`	`if (args.get("types", typestring))`
`1053`	`1053`	`{`
`1054`	`1054`	`Vector<BaseString> tmp;`
`1055`	`1055`	`typestring.split(tmp, " ");`
`1056`		`- for (i = 0; i < tmp.size(); i++)`
	`1056`	`+ for (i = 0; i < tmp.size() && i < NDB_MGM_NODE_TYPE_MAX; i++)`
`1057`	`1057`	`{`
`1058`	`1058`	`types[i] = ndb_mgm_match_node_type(tmp[i].c_str());`
	`1059`	`+ if (types[i] == NDB_MGM_NODE_TYPE_UNKNOWN) {`
	`1060`	`+ // Either end of typestring or junk found`
	`1061`	`+ break;`
	`1062`	`+ }`
`1059`	`1063`	`}`
`1060`	`1064`	`types[i] = NDB_MGM_NODE_TYPE_UNKNOWN;`
`1061`	`1065`	`}`