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

VarunNagaraju · VarunNagaraju · commit 6002a0d6ddd7 · 2021-03-08T15:37:51.000+05:30
Change-Id: I422f31470c146f695a6ac2e2326c18eecd900b6c
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -762,6 +762,9 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)
       int processId = nodes[i].processId;
       int nodeGroup= nodes[i].nodeGroup;
 
+      if (nodeGroup != 0) {
+        ndberr << "Expected nodeGroup 0, but got " << nodeGroup << endl;
+      }
       if (seen_groups.get(nodeGroup))
       {
         // One node in this node group already down

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,9 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)`
`762`	`762`	`int processId = nodes[i].processId;`
`763`	`763`	`int nodeGroup= nodes[i].nodeGroup;`
`764`	`764`
	`765`	`+ if (nodeGroup != 0) {`
	`766`	`+ ndberr << "Expected nodeGroup 0, but got " << nodeGroup << endl;`
	`767`	`+ }`
`765`	`768`	`if (seen_groups.get(nodeGroup))`
`766`	`769`	`{`
`767`	`770`	`// One node in this node group already down`