diff options
| author | unknown <kaa@polly.local> | 2007-03-28 20:10:41 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-03-28 20:10:41 +0400 |
| commit | 2551c20f7d856d1fafa043a8e239d37b764b552f (patch) | |
| tree | 0a096759555bd76ee227232284c2f4f72969a981 | |
| parent | feff00583ee07e73768e8237be7a4319354e7f69 (diff) | |
| parent | 3d90a07a0666877448c5662aa5dc8b2561d2d4fb (diff) | |
| download | mariadb-git-2551c20f7d856d1fafa043a8e239d37b764b552f.tar.gz | |
Merge polly.local:/tmp/maint/bug26844/my50-bug26844
into polly.local:/tmp/maint/bug26844/my51-bug26844
mysys/my_malloc.c:
Auto merged
mysys/safemalloc.c:
Auto merged
| -rw-r--r-- | mysys/my_malloc.c | 2 | ||||
| -rw-r--r-- | mysys/safemalloc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 3601a533480..b0e775177a6 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); } diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index da15b02345b..f2a4c280610 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -150,11 +150,11 @@ gptr _mymalloc(uint size, const char *filename, uint lineno, myf MyFlags) char buff[SC_MAXWIDTH]; my_errno=errno; sprintf(buff,"Out of memory at line %d, '%s'", lineno, filename); - my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG)); + my_message(EE_OUTOFMEMORY, buff, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH)); sprintf(buff,"needed %d byte (%ldk), memory in use: %ld bytes (%ldk)", size, (size + 1023L) / 1024L, sf_malloc_max_memory, (sf_malloc_max_memory + 1023L) / 1024L); - my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG)); + my_message(EE_OUTOFMEMORY, buff, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH)); } DBUG_PRINT("error",("Out of memory, in use: %ld at line %d, '%s'", sf_malloc_max_memory,lineno, filename)); |