diff options
| author | unknown <kaa@polly.local> | 2007-03-26 13:31:23 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-03-26 13:31:23 +0400 |
| commit | 3d90a07a0666877448c5662aa5dc8b2561d2d4fb (patch) | |
| tree | 52c94bbbe186681fb26a152efa8d8bf5e88d4925 /mysys/my_malloc.c | |
| parent | 85c3f6df4516dd8799169db64fe6d4a2748d80c0 (diff) | |
| download | mariadb-git-3d90a07a0666877448c5662aa5dc8b2561d2d4fb.tar.gz | |
Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".
Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
mysys/my_malloc.c:
Pass ME_NOREFRESH flag to an error handler in my_malloc() in case of memory allocation failure, so that it gets logged to the error log.
mysys/safemalloc.c:
Pass ME_NOREFRESH flag to an error handler in _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 3baf55d4c57..38d0263b495 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -37,7 +37,7 @@ gptr my_malloc(unsigned int 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),size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH),size); if (my_flags & MY_FAE) exit(1); } |