Commit 693296b5 authored by jyang's avatar jyang

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
parent a0369766
...@@ -591,6 +591,7 @@ os_mem_alloc_large( ...@@ -591,6 +591,7 @@ os_mem_alloc_large(
fprintf(stderr, "InnoDB: HugeTLB: Warning: Failed to" fprintf(stderr, "InnoDB: HugeTLB: Warning: Failed to"
" attach shared memory segment, errno %d\n", " attach shared memory segment, errno %d\n",
errno); errno);
ptr = NULL;
} }
/* Remove the shared memory segment so that it will be /* Remove the shared memory segment so that it will be
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment