List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 17 2010 2:56pm
Subject:bzr commit into mysql-trunk-bugfixing branch (davi:3127) Bug#34043
View as plain text  
# At a local mysql-trunk-bugfixing repository of davi

 3127 Davi Arnaut	2010-07-17
      Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
      
      Post-merge fix: remove leftovers from safemalloc removal.

    modified:
      include/my_sys.h
      mysys/my_static.c
      mysys/my_static.h
=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2010-07-15 11:16:06 +0000
+++ b/include/my_sys.h	2010-07-17 14:56:00 +0000
@@ -253,7 +253,6 @@ extern int my_umask_dir,
 	   my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
 	   my_dont_interrupt;	/* call remember_intr when set */
 extern my_bool my_use_symdir;
-extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;
 
 extern ulong	my_default_record_cache_size;
 extern my_bool  my_disable_locking, my_disable_async_io,

=== modified file 'mysys/my_static.c'
--- a/mysys/my_static.c	2010-07-15 11:16:06 +0000
+++ b/mysys/my_static.c	2010-07-17 14:56:00 +0000
@@ -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 */

=== modified file 'mysys/my_static.h'
--- a/mysys/my_static.h	2010-07-15 11:16:06 +0000
+++ b/mysys/my_static.h	2010-07-17 14:56:00 +0000
@@ -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;


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20100717145600-y1gi6x0gk0gssauk.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (davi:3127) Bug#34043Davi Arnaut17 Jul