Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Iea503cf424b10a6d4522b7daa16d69906ebfb2a4

Author: frazerclement

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

@@ -3174,10 +3174,10 @@ void NdbEventBuffer::complete_memory_block(MonotonicEpoch highest_epoch) {
   }
 }
 
-Uint32 NdbEventBuffer::get_free_data_sz() const {
+Uint64 NdbEventBuffer::get_free_data_sz() const {
 #if defined(VM_TRACE)
   {
-    Uint32 free = 0;
+    Uint64 free = 0;
     EventMemoryBlock *mem_block = m_mem_block_free;
     while (mem_block != nullptr) {
       free += mem_block->get_size();

storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp

@@ -888,7 +888,7 @@ class NdbEventBuffer {
   void add_blob_data(EventBufDataHead *main_data, EventBufData *blob_data);
 
   void *alloc(Uint32 sz);
-  Uint32 get_free_data_sz() const;
+  Uint64 get_free_data_sz() const;
   Uint64 get_used_data_sz() const;
 
   // Must report status if buffer manager state is changed
@@ -982,7 +982,7 @@ class NdbEventBuffer {
     (Included in ::get_free_data_sz())
   */
   EventMemoryBlock *m_mem_block_free;
-  Uint32 m_mem_block_free_sz;  // Total size of above
+  Uint64 m_mem_block_free_sz;  // Total size of above
 
   bool m_queue_empty_epoch;