Merge ../mysql-5.6-cluster-7.3 into mysql-5.6-cluster-7.4

Author: frazerclement

storage/ndb/include/ndb_version.h.in

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2019, 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, version 2.0,
@@ -941,4 +941,43 @@ ndbd_isolate_ord(Uint32 x)
   return 1;
 }
 
+// New limitations from WL#12757
+
+#define NDBD_80_PROTOCOL_ACCEPT_74 NDB_MAKE_VERSION(7,4,6)
+#define NDBD_80_PROTOCOL_ACCEPT_75 NDB_MAKE_VERSION(7,5,6)
+#define NDBD_80_PROTOCOL_ACCEPT_76 NDB_MAKE_VERSION(7,6,4)
+
+static
+inline
+int
+ndbd_protocol_accepted_by_8_0(Uint32 x)
+{
+  const Uint32 major = (x >> 16) & 0xFF;
+  const Uint32 minor = (x >>  8) & 0xFF;
+  if (major < 7)
+  {
+    return 0;
+  }
+  else if (major == 7)
+  {
+    if (minor < 4)
+    {
+      return 0;
+    }
+    else if (minor == 4)
+    {
+      return x >= NDBD_80_PROTOCOL_ACCEPT_74;
+    }
+    else if (minor == 5)
+    {
+      return x >= NDBD_80_PROTOCOL_ACCEPT_75;
+    }
+    else if (minor == 6)
+    {
+      return x >= NDBD_80_PROTOCOL_ACCEPT_76;
+    }
+  }
+  return 1;
+}
+
 #endif

storage/ndb/test/ndbapi/testUpgrade.cpp

@@ -1448,24 +1448,64 @@ bool versionsSpanBoundary(int verA, int verB, int incBoundaryVer)
            (maxPeerVer >= incBoundaryVer) );
 }
 
+bool versionsProtocolCompatible(int verA, int verB)
+{
+  /**
+   * Version 8.0 introduced some incompatibilities, check
+   * whether they make a test unusable
+   */
+  if (versionsSpanBoundary(verA, verB, NDB_MAKE_VERSION(8,0,0)))
+  {
+    /* Versions span 8.0 boundary, check compatibility */
+    if (!ndbd_protocol_accepted_by_8_0(verA) ||
+        !ndbd_protocol_accepted_by_8_0(verB))
+    {
+      ndbout_c("Versions spanning 8.0 boundary not protocol compatible : "
+               "%x -> %x",
+               verA, verB);
+      return false;
+    }
+  }
+
+  return true;
+}
+
 static int checkForDowngrade(NDBT_Context* ctx, NDBT_Step* step)
 {
-  if (preVersion >= postVersion)
+  if (preVersion < postVersion)
   {
-    return NDBT_OK;
+    ndbout_c("Error: Not doing downgrade as expected : "
+             "%x -> %x",
+             preVersion, postVersion);
+    return NDBT_FAILED;
+  }
+
+  if (!versionsProtocolCompatible(preVersion, postVersion))
+  {
+    ndbout_c("Skipping test due to protocol incompatibility");
+    return NDBT_SKIPPED;
   }
-  ndbout << "Error: Not doing downgrade as expected" << endl;
-  return NDBT_FAILED;
+
+  return NDBT_OK;
 }
 
 static int checkForUpgrade(NDBT_Context* ctx, NDBT_Step* step)
 {
-  if (preVersion <= postVersion)
+  if (preVersion > postVersion)
   {
-    return NDBT_OK;
+    ndbout_c("Error: Not doing upgrade as expected : "
+             "%x -> %x",
+             preVersion, postVersion);
+    return NDBT_FAILED;
   }
-  ndbout << "Error: Not doing upgrade as expected" << endl;
-  return NDBT_FAILED;
+
+  if (!versionsProtocolCompatible(preVersion, postVersion))
+  {
+    ndbout_c("Skipping test due to protocol incompatibility");
+    return NDBT_SKIPPED;
+  }
+
+  return NDBT_OK;
 }
 
 #define NDB_USE_CONFIG_VERSION_V2_80 NDB_MAKE_VERSION(8,0,18)
@@ -2117,13 +2157,25 @@ NDBT_TESTSUITE(testUpgrade);
 TESTCASE("ShowVersions",
          "Upgrade API, showing actual versions run")
 {
+  /**
+   * This test is used to check the versions involved, and
+   * should do a minimal amount of other things, so that it
+   * does not depend on anything that can break between
+   * releases.
+   */
   INITIALIZER(runCheckStarted);
   STEP(runShowVersion);
   STEP(runRecordVersion);
   VERIFIER(startPostUpgradeChecks);
 }
 POSTUPGRADE("ShowVersions")
 {
+  /**
+   * This test postupgrade is used to check the versions involved, and
+   * should do a minimal amount of other things, so that it
+   * does not depend on anything that can break between
+   * releases.
+   */
   TC_PROPERTY("PostUpgrade", Uint32(1));
   INITIALIZER(runCheckStarted);
   STEP(runShowVersion);