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

Change-Id: I35963894cfaeb0ee95ffbabe4cd131f8a4008f0f

Author: Ole John Aske

sql/ha_ndbcluster.cc

@@ -9069,7 +9069,7 @@ ha_ndbcluster::start_transaction_row(const NdbRecord *ndb_record,
 
   Ndb *ndb= m_thd_ndb->ndb;
 
-  Uint64 tmp[(MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1];
+  Uint32 tmp[MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY];
   char *buf= (char*)&tmp[0];
   trans= ndb->startTransaction(ndb_record,
                                (const char*)record,
@@ -9101,7 +9101,7 @@ ha_ndbcluster::start_transaction_key(uint inx_no,
   Ndb *ndb= m_thd_ndb->ndb;
   const NdbRecord *key_rec= m_index[inx_no].ndb_unique_record_key;
 
-  Uint64 tmp[(MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1];
+  Uint32 tmp[MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY];
   char *buf= (char*)&tmp[0];
   trans= ndb->startTransaction(key_rec,
                                (const char*)key_data,
@@ -17857,7 +17857,7 @@ uint32 ha_ndbcluster::calculate_key_hash_value(Field **field_array)
   struct Ndb::Key_part_ptr *key_data_ptr= &key_data[0];
   Uint32 i= 0;
   int ret_val;
-  Uint64 tmp[(MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1];
+  Uint32 tmp[MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY];
   void *buf= (void*)&tmp[0];
   DBUG_ENTER("ha_ndbcluster::calculate_key_hash_value");
 

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

@@ -7029,28 +7029,28 @@ Dblqh::handle_nr_copy(Signal* signal, Ptr<TcConnectionrec> regTcPtr)
     if (len > 0 && !match &&
         g_key_descriptor_pool.getPtr(tableId)->hasCharAttr)
     {
-      Uint64 reqKey[ MAX_KEY_SIZE_IN_WORDS >> 1 ];
-      Uint64 dbXfrmKey[ (MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1 ];
-      Uint64 reqXfrmKey[ (MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1 ];
+      Uint32 reqKey[MAX_KEY_SIZE_IN_WORDS];
+      Uint32 dbXfrmKey[MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY];
+      Uint32 reqXfrmKey[MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY];
       Uint32 keyPartLen[MAX_ATTRIBUTES_IN_INDEX];
 
       jam();
 
       /* Transform db table key read from DB above into dbXfrmKey */
       const int dbXfrmKeyLen = xfrm_key(tableId,
                                         &signal->theData[24],
-                                        (Uint32*)dbXfrmKey,
+                                        dbXfrmKey,
                                         sizeof(dbXfrmKey) >> 2,
                                         keyPartLen);
       ndbassert(dbXfrmKeyLen > 0);
 
       /* Copy request key into linear space */
-      copy((Uint32*) reqKey, regTcPtr.p->keyInfoIVal);
+      copy(reqKey, regTcPtr.p->keyInfoIVal);
 
       /* Transform request key */
       const int reqXfrmKeyLen = xfrm_key(tableId,
-                                         (Uint32*)reqKey,
-                                         (Uint32*)reqXfrmKey,
+                                         reqKey,
+                                         reqXfrmKey,
                                          sizeof(reqXfrmKey) >> 2,
                                          keyPartLen);
       ndbassert(reqXfrmKeyLen > 0);
@@ -7416,7 +7416,7 @@ Uint32
 Dblqh::readPrimaryKeys(Uint32 opPtrI, Uint32 * dst, bool xfrm)
 {
   TcConnectionrecPtr regTcPtr;  
-  Uint64 Tmp[MAX_KEY_SIZE_IN_WORDS >> 1];
+  Uint32 Tmp[MAX_KEY_SIZE_IN_WORDS];
 
   jamEntry();
   regTcPtr.i = opPtrI;

storage/ndb/src/ndbapi/NdbScanOperation.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2022, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    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,
@@ -764,12 +764,12 @@ NdbIndexScanOperation::getDistKeyFromRange(const NdbRecord *key_record,
                                            const char *row,
                                            Uint32* distKey)
 {
-  const Uint32 MaxKeySizeInLongWords= (NDB_MAX_KEY_SIZE + 7) / 8;
-  // Note: xfrm:ed key can/will be bigger than MaxKeySizeInLongWords
-  Uint64 tmp[ MaxKeySizeInLongWords * MAX_XFRM_MULTIPLY ];
-  char* tmpshrink = (char*)tmp;
-  Uint32 tmplen = (Uint32)sizeof(tmp);
-
+  // Note: xfrm:ed key can/will be bigger than MAX_KEY_SIZE_IN_WORDS
+  Uint32 xfrmbuf[MAX_KEY_SIZE_IN_WORDS * MAX_XFRM_MULTIPLY];
+  char shrinkbuf[NDB_MAX_KEY_SIZE];
+  char* tmpshrink = shrinkbuf;
+  Uint32 tmplen = (Uint32)sizeof(shrinkbuf);
+  
   /* This can't work for User Defined partitioning */
   assert(key_record->table->m_fragmentType !=
          NdbDictionary::Object::UserDefined);
@@ -813,7 +813,7 @@ NdbIndexScanOperation::getDistKeyFromRange(const NdbRecord *key_record,
 
   Uint32 hashValue;
   int ret = Ndb::computeHash(&hashValue, result_record->table,
-                             ptrs, tmpshrink, tmplen);
+                             ptrs, xfrmbuf, sizeof(xfrmbuf));
   if (ret == 0)
   {
     *distKey = hashValue;