diff options
| author | Xanadu <xanadu.xoroi@gmail.com> | 2011-03-05 00:50:00 +0100 |
|---|---|---|
| committer | Xanadu <xanadu.xoroi@gmail.com> | 2011-03-05 02:41:59 +0100 |
| commit | c47c94f958dd11be44bad16cd5d97d9f2fea6dbf (patch) | |
| tree | f4849f06a2b5bbda7036d07efde8d393ac54e620 /dep/mysqllite/mysys/my_alloc.c | |
| parent | ed148818942fab299f344cb9c421a4df0b09fb98 (diff) | |
Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA)
Diffstat (limited to 'dep/mysqllite/mysys/my_alloc.c')
| -rw-r--r-- | dep/mysqllite/mysys/my_alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dep/mysqllite/mysys/my_alloc.c b/dep/mysqllite/mysys/my_alloc.c index dd27dcda41e..903826dd975 100644 --- a/dep/mysqllite/mysys/my_alloc.c +++ b/dep/mysqllite/mysys/my_alloc.c @@ -120,7 +120,7 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, { /* remove block from the list and free it */ *prev= mem->next; - my_free(mem, MYF(0)); + my_free(mem); } else prev= &mem->next; @@ -163,7 +163,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) }); length+=ALIGN_SIZE(sizeof(USED_MEM)); - if (!(next = (USED_MEM*) my_malloc(length,MYF(MY_WME)))) + if (!(next = (USED_MEM*) my_malloc(length,MYF(MY_WME | ME_FATALERROR)))) { if (mem_root->error_handler) (*mem_root->error_handler)(); @@ -214,7 +214,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) get_size= length+ALIGN_SIZE(sizeof(USED_MEM)); get_size= max(get_size, block_size); - if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME)))) + if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME | ME_FATALERROR)))) { if (mem_root->error_handler) (*mem_root->error_handler)(); @@ -362,13 +362,13 @@ void free_root(MEM_ROOT *root, myf MyFlags) { old=next; next= next->next ; if (old != root->pre_alloc) - my_free(old,MYF(0)); + my_free(old); } for (next=root->free ; next ;) { old=next; next= next->next; if (old != root->pre_alloc) - my_free(old,MYF(0)); + my_free(old); } root->used=root->free=0; if (root->pre_alloc) |