summaryrefslogtreecommitdiff
path: root/mysys/my_static.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-17 11:56:00 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-17 11:56:00 -0300
commit917c33cfbf7feade67ae4d4d884870e8f96f822e (patch)
treedfa2a8083e418dfdab8ce2d35d8056737de2f61e /mysys/my_static.c
parentb283ffcd53af7a177a8325ddbce92e9b95751917 (diff)
downloadmariadb-git-917c33cfbf7feade67ae4d4d884870e8f96f822e.tar.gz
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: remove leftovers from safemalloc removal.
Diffstat (limited to 'mysys/my_static.c')
-rw-r--r--mysys/my_static.c13
1 files changed, 0 insertions, 13 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 */