Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Author: Maitrayi Sabaratnam

storage/ndb/test/ndbapi/testSystemRestart.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -3270,10 +3270,15 @@ runLoad(NDBT_Context* ctx, NDBT_Step* step)
   int retries = 0;
   while (!ctx->isTestStopped() && myDict->createTable(*copy)!= 0)
   {
-    // 4009 Cluster Failure is acceptable since SR is in progress
-    CHK(myDict->getNdbError().code == 4009, myDict->getNdbError().message);
+    /* '4009 - Cluster Failure' is acceptable since SR is in progress.
+     * '711 - System busy with node restart, schema operations not allowed'
+     * is acceptable since the stale node performs an NR during SR.
+     */
+    CHK((myDict->getNdbError().code == 4009 ||
+         myDict->getNdbError().code == 711),
+        myDict->getNdbError().message);
     retries++;
-    CHK(retries < 60, "Creating table not finished within timeout"); // 1 min
+    CHK(retries < 180, "Creating table not finished within timeout"); // 3 min
     NdbSleep_MilliSleep(1000);
   }