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

Maitrayi Sabaratnam · Maitrayi Sabaratnam · commit 105780f16871 · 2020-06-02T13:57:58.000+02:00
diff --git a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
@@ -7260,7 +7260,7 @@ runDelayedNodeFail(NDBT_Context *ctx, NDBT_Step *step)
       ctx->stopTest();
       return NDBT_FAILED;
     }
-    g_err << "Waitting for node " << victim << "to die" << endl;
+    g_err << "Waiting for node " << victim << " to die" << endl;
     restarter.waitNodesNoStart(&victim, 1);
     ndbout_c("  start node");
     if (restarter.startNodes(&victim, 1) != 0)

Original file line number	Diff line number	Diff line change
`@@ -7260,7 +7260,7 @@ runDelayedNodeFail(NDBT_Context ctx, NDBT_Step step)`
`7260`	`7260`	`ctx->stopTest();`
`7261`	`7261`	`return NDBT_FAILED;`
`7262`	`7262`	`}`
`7263`		`- g_err << "Waitting for node " << victim << "to die" << endl;`
	`7263`	`+ g_err << "Waiting for node " << victim << " to die" << endl;`
`7264`	`7264`	`restarter.waitNodesNoStart(&victim, 1);`
`7265`	`7265`	`ndbout_c(" start node");`
`7266`	`7266`	`if (restarter.startNodes(&victim, 1) != 0)`