From 361a11decb364664b517858891bfacc67fd20c99 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 24 Nov 2023 19:58:11 +0100
Subject: [PATCH] backport MEM_ROOT::total_alloc removal from 10.5

to fix sizeof(MEM_ROOT)
---
 include/my_alloc.h | 1 -
 mysys/my_alloc.c   | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/include/my_alloc.h b/include/my_alloc.h
index 8d7ebe013db..bddc5e9c0d0 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -45,7 +45,6 @@ typedef struct st_mem_root
   /* if block have less memory it will be put in 'used' list */
   size_t min_malloc;
   size_t block_size;               /* initial block size */
-  size_t total_alloc;
   unsigned int block_num;          /* allocated blocks counter */
   /* 
      first free block in queue test counter (if it exceed 
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index beda4d50480..983c4440243 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -73,7 +73,6 @@ void init_alloc_root(MEM_ROOT *mem_root, const char *name, size_t block_size,
   mem_root->error_handler= 0;
   mem_root->block_num= 4;			/* We shift this with >>2 */
   mem_root->first_block_usage= 0;
-  mem_root->total_alloc= 0;
   mem_root->name= name;
 
 #if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG))
@@ -84,7 +83,6 @@ void init_alloc_root(MEM_ROOT *mem_root, const char *name, size_t block_size,
                                MYF(my_flags))))
     {
       mem_root->free->size= pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM));
-      mem_root->total_alloc= pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM));
       mem_root->free->left= pre_alloc_size;
       mem_root->free->next= 0;
       TRASH_MEM(mem_root->free);
@@ -142,7 +140,6 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
         {
           /* remove block from the list and free it */
           *prev= mem->next;
-          mem_root->total_alloc-= mem->size;
           my_free(mem);
         }
         else
@@ -153,7 +150,6 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
                                        MYF(MALLOC_FLAG(mem_root)))))
       {
         mem->size= size; 
-        mem_root->total_alloc+= size;
         mem->left= pre_alloc_size;
         mem->next= *prev;
         *prev= mem_root->pre_alloc= mem;
@@ -257,7 +253,6 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length)
       DBUG_RETURN((void*) 0);                      /* purecov: inspected */
     }
     mem_root->block_num++;
-    mem_root->total_alloc+= get_size;
     next->next= *prev;
     next->size= get_size;
     next->left= get_size-ALIGN_SIZE(sizeof(USED_MEM));
@@ -416,7 +411,6 @@ void free_root(MEM_ROOT *root, myf MyFlags)
     old=next; next= next->next ;
     if (old != root->pre_alloc)
     {
-      root->total_alloc-= old->size;
       my_free(old);
     }
   }
@@ -425,7 +419,6 @@ void free_root(MEM_ROOT *root, myf MyFlags)
     old=next; next= next->next;
     if (old != root->pre_alloc)
     {
-      root->total_alloc-= old->size;
       my_free(old);
     }
   }