diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-11-02 19:00:26 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-11-02 19:00:26 +0400 |
| commit | f276d54404f73ffe4d4b8b643ee186def904e3af (patch) | |
| tree | 58f2c750c078b15235a94a7858c2d91391f8b158 /storage/innobase/os | |
| parent | c29b740bec22426e4818510f9bc2144c6b9f3ba6 (diff) | |
| download | mariadb-git-f276d54404f73ffe4d4b8b643ee186def904e3af.tar.gz | |
Applying InnoDB snashot 5.1-ss6129
Detailed revision comments:
r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines
branches/5.1: In os_mem_alloc_large(), if we fail to attach
the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
Diffstat (limited to 'storage/innobase/os')
| -rw-r--r-- | storage/innobase/os/os0proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c index a99fe8b6a0e..f00475fc528 100644 --- a/storage/innobase/os/os0proc.c +++ b/storage/innobase/os/os0proc.c @@ -591,6 +591,7 @@ os_mem_alloc_large( fprintf(stderr, "InnoDB: HugeTLB: Warning: Failed to" " attach shared memory segment, errno %d\n", errno); + ptr = NULL; } /* Remove the shared memory segment so that it will be |