diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-29 23:00:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-04 12:32:22 +0200 |
| commit | 37659ef43be689b2a2f8c507d9395e839bf66066 (patch) | |
| tree | d520b7a43778431730704543998f1b1bb83e9708 /mysys/my_malloc.c | |
| parent | 9988a423d229730b252942b7fa066d1591b7eca9 (diff) | |
| download | mariadb-git-37659ef43be689b2a2f8c507d9395e839bf66066.tar.gz | |
mysys: remove dead ME_xxx flags
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 6a3ec8da093..7115226eee9 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -106,8 +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_WAITTANG + - ME_NOREFRESH + ME_FATALERROR),size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_NOREFRESH+ME_FATALERROR),size); if (my_flags & MY_FAE) abort(); } @@ -175,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_WAITTANG + ME_FATALERROR), size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL + ME_FATALERROR), size); } else { |