diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-11-03 14:25:00 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-11-03 14:25:00 +0400 |
| commit | 5b62cd212eed232a229ba8f8ab19eb3d59a14918 (patch) | |
| tree | 066384d981ebe5005b886734a391cbbaf4dba47c /storage | |
| parent | be3fd511c5fcfa0e891b947e2505d621de04331a (diff) | |
| download | mariadb-git-5b62cd212eed232a229ba8f8ab19eb3d59a14918.tar.gz | |
Applying InnoDB plugin snashot
Detailed revision comments:
r6109 | jyang | 2009-10-29 10:37:32 +0200 (Thu, 29 Oct 2009) | 7 lines
branches/zip: 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.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198 Approved by: Marko
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/os/os0proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innodb_plugin/os/os0proc.c b/storage/innodb_plugin/os/os0proc.c index a0ea9a1b258..48922886f23 100644 --- a/storage/innodb_plugin/os/os0proc.c +++ b/storage/innodb_plugin/os/os0proc.c @@ -97,6 +97,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 |