diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-17 11:56:00 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-17 11:56:00 -0300 |
commit | 917c33cfbf7feade67ae4d4d884870e8f96f822e (patch) | |
tree | dfa2a8083e418dfdab8ce2d35d8056737de2f61e /mysys/my_static.h | |
parent | b283ffcd53af7a177a8325ddbce92e9b95751917 (diff) | |
download | mariadb-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.h')
-rw-r--r-- | mysys/my_static.h | 23 |
1 files changed, 0 insertions, 23 deletions
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; |