diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-29 23:54:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-04 12:32:23 +0200 |
| commit | c9061d11022d8fc7274510b04d48bf3f164ebf96 (patch) | |
| tree | a259f436b0ffe9b61aaf4185f809005796065fd7 /mysys/my_alloc.c | |
| parent | 37659ef43be689b2a2f8c507d9395e839bf66066 (diff) | |
| download | mariadb-git-c9061d11022d8fc7274510b04d48bf3f164ebf96.tar.gz | |
mysys: rename ME_xxx flags to match plugin api
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 7139466be17..cdce8d4aa67 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -192,7 +192,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 | ME_FATALERROR | + MYF(MY_WME | ME_FATAL | MALLOC_FLAG(mem_root->block_size))))) { if (mem_root->error_handler) @@ -247,7 +247,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) get_size= MY_MAX(get_size, block_size); if (!(next = (USED_MEM*) my_malloc(get_size, - MYF(MY_WME | ME_FATALERROR | + MYF(MY_WME | ME_FATAL | MALLOC_FLAG(mem_root-> block_size))))) { |