Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled

Post-merge fix: remove leftovers from safemalloc removal.

2 files changed, 0 insertions, 36 deletions

diff --git a/mysys/my_static.c b/mysys/my_static.c
index 0b2f86b4038..2869b43543a 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -65,19 +65,6 @@ my_bool my_use_large_pages= 0;
 uint    my_large_page_size= 0;
 #endif
 
-	/* from safe_malloc */
-uint sf_malloc_prehunc=0,		/* If you have problem with core- */
-     sf_malloc_endhunc=0,		/* dump when malloc-message.... */
-					/* set theese to 64 or 128  */
-     sf_malloc_quick=0;			/* set if no calls to sanity */
-size_t sf_malloc_cur_memory= 0L;		/* Current memory usage */
-size_t sf_malloc_max_memory= 0L;		/* Maximum memory usage */
-uint  sf_malloc_count= 0;		/* Number of times NEW() was called */
-uchar *sf_min_adress= (uchar*) ~(unsigned long) 0L,
-     *sf_max_adress= (uchar*) 0L;
-/* Root of the linked list of struct st_irem */
-struct st_irem *sf_malloc_root = NULL;
-
 	/* from my_alarm */
 int volatile my_have_got_alarm=0;	/* declare variable to reset */
 ulong my_time_to_wait_for_lock=2;	/* In seconds */
diff --git a/mysys/my_static.h b/mysys/my_static.h
index f50f7d8be10..2c9cef0f101 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -34,25 +34,6 @@ struct st_remember {
   sig_handler (*func)(int number);
 };
 
-/*
-  Structure that stores information of a allocated memory block
-  The data is at &struct_adr+sizeof(ALIGN_SIZE(sizeof(struct irem)))
-  The lspecialvalue is at the previous 4 bytes from this, which may not
-  necessarily be in the struct if the struct size isn't aligned at a 8 byte
-  boundary.
-*/
-
-struct st_irem
-{
-  struct st_irem *next;		/* Linked list of structures	   */
-  struct st_irem *prev;		/* Other link			   */
-  char *filename;		/* File in which memory was new'ed */
-  size_t datasize;		/* Size requested		   */
-  uint32 linenum;		/* Line number in above file	   */
-  uint32 SpecialValue;		/* Underrun marker value	   */
-};
-
-
 extern char curr_dir[FN_REFLEN], home_dir_buff[FN_REFLEN];
 
 extern volatile int _my_signals;
@@ -63,10 +44,6 @@ extern const char *soundex_map;
 extern USED_MEM* my_once_root_block;
 extern uint	 my_once_extra;
 
-extern uchar	*sf_min_adress,*sf_max_adress;
-extern uint	sf_malloc_count;
-extern struct st_irem *sf_malloc_root;
-
 extern struct st_my_file_info my_file_info_default[MY_NFILE];
 
 extern ulonglong query_performance_frequency, query_performance_offset;