BUG#12983

TRASH macro confliciting with TRASH in my_sys.h
parent 47e5e73a
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -221,11 +221,7 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size) ...@@ -221,11 +221,7 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size)
#endif #endif
} }
#ifdef SAFEMALLOC #define TRASH_MEM(X) TRASH(((char*)(X) + ((X)->size-(X)->left)), (X)->left)
#define TRASH(X) bfill(((char*)(X) + ((X)->size-(X)->left)), (X)->left, 0xa5)
#else
#define TRASH /* no-op */
#endif
/* Mark all data in blocks free for reusage */ /* Mark all data in blocks free for reusage */
...@@ -239,7 +235,7 @@ static inline void mark_blocks_free(MEM_ROOT* root) ...@@ -239,7 +235,7 @@ static inline void mark_blocks_free(MEM_ROOT* root)
for (next= root->free; next; next= *(last= &next->next)) for (next= root->free; next; next= *(last= &next->next))
{ {
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM)); next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
TRASH(next); TRASH_MEM(next);
} }
/* Combine the free and the used list */ /* Combine the free and the used list */
...@@ -249,7 +245,7 @@ static inline void mark_blocks_free(MEM_ROOT* root) ...@@ -249,7 +245,7 @@ static inline void mark_blocks_free(MEM_ROOT* root)
for (; next; next= next->next) for (; next; next= next->next)
{ {
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM)); next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
TRASH(next); TRASH_MEM(next);
} }
/* Now everything is set; Indicate that nothing is used anymore */ /* Now everything is set; Indicate that nothing is used anymore */
...@@ -310,7 +306,7 @@ void free_root(MEM_ROOT *root, myf MyFlags) ...@@ -310,7 +306,7 @@ void free_root(MEM_ROOT *root, myf MyFlags)
{ {
root->free=root->pre_alloc; root->free=root->pre_alloc;
root->free->left=root->pre_alloc->size-ALIGN_SIZE(sizeof(USED_MEM)); root->free->left=root->pre_alloc->size-ALIGN_SIZE(sizeof(USED_MEM));
TRASH(root->pre_alloc); TRASH_MEM(root->pre_alloc);
root->free->next=0; root->free->next=0;
} }
root->block_num= 4; root->block_num= 4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment