Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I5a2edc941f4246f41cfd1b72c38db26c402146e6

Author: Maitrayi Sabaratnam

storage/ndb/test/ndbapi/testNodeRestart.cpp

@@ -10827,10 +10827,11 @@ int runDelayGCP_SAVEREQ(NDBT_Context* ctx, NDBT_Step* step)
   }
 
   int result = NDBT_OK;
+  unsigned int timeout = 240; // To suite many node/replica tests
   const int victim = restarter.getNode(NdbRestarter::NS_RANDOM);
   const Uint32 lcp_max_lag = ctx->getProperty("MaxLcpLag",
                                               Uint32(60));
-  const Uint32 clear_error_insert_seconds = 20;
+  const Uint32 clear_error_insert_seconds = 60;
 
   for (int scenario=1; scenario < 4; scenario++)
   {
@@ -10848,13 +10849,13 @@ int runDelayGCP_SAVEREQ(NDBT_Context* ctx, NDBT_Step* step)
                                        false, /* abort */
                                        false  /* force */) == 0);
       g_err << "Waiting until node " << victim << " stops" << endl;
-      restarter.waitNodesNoStart(&victim, 1);
+      restarter.waitNodesNoStart(&victim, 1, timeout);
       break;
     case 3:
       g_err << "Scenario 3 : Start node, block GCP, check no LCP stall" << endl;
       g_err << "Starting node " << victim << endl;
       CHECK2(restarter.startNodes(&victim, 1) == 0);
-      CHECK2(restarter.waitClusterStarted() == 0);
+      CHECK2(restarter.waitClusterStarted(timeout) == 0);
       break;
     default:
       abort();
@@ -10863,9 +10864,9 @@ int runDelayGCP_SAVEREQ(NDBT_Context* ctx, NDBT_Step* step)
     g_err << "Inserting err delaying GCP_SAVEREQ" << endl;
     CHECK2(restarter.insertErrorInAllNodes(7237) == 0);
 
-    g_err << "Sleeping for 3 * MaxLcpLag = " << 3*lcp_max_lag << " seconds."
+    g_err << "Sleeping for 3 * MaxLcpLag = " << 3 * lcp_max_lag << " seconds."
           << endl;
-    NdbSleep_SecSleep(3*lcp_max_lag);
+    NdbSleep_SecSleep(3 * lcp_max_lag);
 
     // Remove the error insertion and let the GCP and LCP to finish
     CHECK2(restarter.insertErrorInAllNodes(0) == 0);

storage/ndb/test/run-test/daily-devel--07-tests.txt

@@ -294,7 +294,7 @@ max-time: 600
 
 cmd: testNodeRestart
 args: -n CheckGcpStopTimerDistributed T1
-max-time: 520
+max-time: 2000
 
 cmd: testNdbApi
 args: -n TestSlowConnectEnable T1