Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5 (bug#25152165)

Author: zmur

mysql-test/suite/ndb/t/ndb_addnode.test

@@ -33,7 +33,8 @@ CREATE TABLESPACE ts_1
     INITIAL_SIZE 16M
     ENGINE NDB;
 
-create table t1(id int NOT NULL PRIMARY KEY, data char(8)) engine=ndb;
+# Using a pk bigger than 80 bytes, see bug#25152165.
+create table t1(id int, data char(8), id2 binary(80), primary key (id, id2)) engine=ndb;
 create table t2(id int NOT NULL PRIMARY KEY, data char(8))
 TABLESPACE ts_1 STORAGE DISK engine=ndb;
 # BUG#13714648

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

@@ -13255,8 +13255,9 @@ Uint32 Dblqh::sendKeyinfo20(Signal* signal,
    *  messing with if's below...
    */
   Uint32 keyLen ;
-  if (refToMain(ref) == SUMA && nodeId == getOwnNodeId())
+  if (refToMain(ref) == SUMA)
   {
+    ndbassert(refToNode(ref) == getOwnNodeId());
     keyLen = 0;
   }
   else

storage/ndb/src/kernel/blocks/suma/Suma.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
@@ -4540,6 +4540,17 @@ Suma::execKEYINFO20(Signal* signal)
   ndbrequire(syncPtr.p->m_headersSection != RNIL);
   ndbrequire(syncPtr.p->m_dataSection != RNIL);
 
+  /* SUMA requests a special 'scanInfo only' KeyInfo */
+  ndbassert(data->keyLen == 0);
+  ndbassert(signal->getNoOfSections() == 0);
+
+  /* If there are sections, ignore them.  This should never happen. */
+  if (signal->getNoOfSections() > 0)
+  {
+    SectionHandle handle(this, signal);
+    releaseSections(handle);
+  }
+
   sendScanSubTableData(signal, syncPtr, takeOver);
 }