From c9061d11022d8fc7274510b04d48bf3f164ebf96 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 29 May 2018 23:54:25 +0200 Subject: mysys: rename ME_xxx flags to match plugin api --- mysys/my_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysys/my_alloc.c') 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))))) { -- cgit v1.2.1