Merge cluster-7.6 -> mysql-8.0

Author: blaudden

storage/ndb/test/ndbapi/testUpgrade.cpp

@@ -2545,7 +2545,7 @@ TESTCASE("ChangeHalfRestartChangeHalf",
  "then changing the others")
 {
  TC_PROPERTY("HalfStartedHold", Uint32(1));
- /* Skip MGMDs until 8.0 v1 config bug fixed */
+ // Don't restart MGMDs
  TC_PROPERTY("MgmdNodeSet", Uint32(None));
  INITIALIZER(runCheckStarted);
  INITIALIZER(runReadVersions);
@@ -2554,6 +2554,20 @@ TESTCASE("ChangeHalfRestartChangeHalf",
  // No postupgrade as we do not upgrade API
 }
 
+TESTCASE("ChangeMGMDChangeHalfRestartChangeHalf",
+ "Try changing MGMD then half datanodes, then rolling restart all "
+ "then changing the others")
+{
+ TC_PROPERTY("HalfStartedHold", Uint32(1));
+ // Restart MGMDs
+ TC_PROPERTY("MgmdNodeSet", Uint32(All));
+ INITIALIZER(runCheckStarted);
+ INITIALIZER(runReadVersions);
+ STEP(runUpgrade_Half);
+ STEP(restartDataNodesAtHalfWay);
+ // No postupgrade as we do not upgrade API
+}
+
 
 // Downgrade tests //
 

storage/ndb/test/run-test/upgrade-tests.txt

@@ -85,4 +85,7 @@ cmd: testUpgrade
 args: -n ChangeHalfRestartChangeHalf T1
 max-time: 1200
 
+cmd: testUpgrade
+args: -n ChangeMGMDChangeHalfRestartChangeHalf T1
+max-time: 1200