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_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysys/my_malloc.c') diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 7115226eee9..cdf59d4b8cc 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -106,7 +106,7 @@ void *my_malloc(size_t size, myf my_flags) if (my_flags & MY_FAE) error_handler_hook=fatal_error_handler_hook; if (my_flags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_NOREFRESH+ME_FATALERROR),size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_ERROR_LOG+ME_FATAL),size); if (my_flags & MY_FAE) abort(); } @@ -174,7 +174,7 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags) DBUG_RETURN(oldpoint); my_errno=errno; if (my_flags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL + ME_FATALERROR), size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL + ME_FATAL), size); } else { -- cgit v1.2.1