Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

VarunNagaraju · VarunNagaraju · commit 7d29f18a7696 · 2021-04-30T10:46:14.000+05:30
Change-Id: I4f7c6f3983ff78b565d7ded26992b4a7c87e7136
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -759,6 +759,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
`@@ -759,6 +759,9 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)`
`759`	`759`	`int processId = nodes[i].processId;`
`760`	`760`	`int nodeGroup= nodes[i].nodeGroup;`
`761`	`761`
	`762`	`+ if (nodeGroup != 0) {`
	`763`	`+ ndberr << "Expected nodeGroup 0, but got " << nodeGroup << endl;`
	`764`	`+ }`
`762`	`765`	`if (seen_groups.get(nodeGroup))`
`763`	`766`	`{`
`764`	`767`	`// One node in this node group already down`