opnsense-ports/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc
Franco Fichtner 7ddbb7c0f1 */*: sync with upstream
Taken from: HardenedBSD
2018-05-13 16:20:27 +02:00

22 lines
908 B
C++

--- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC
+++ storage/myisam/mi_dynrec.cc
@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my
DBUG_RETURN(1);
}
/*
- I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
- MAP_NORESERVE
- Do not reserve swap space for this mapping. When swap space is
- reserved, one has the guarantee that it is possible to modify the
- mapping. When swap space is not reserved one might get SIGSEGV
- upon a write if no physical memory is available.
+ MAP_NORESERVE is unimplemented in FreeBSD
*/
info->s->file_map = (uchar *)my_mmap(
0, (size_t)size,
info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_NORESERVE, info->dfile, 0L);
+ MAP_SHARED, info->dfile, 0L);
if (info->s->file_map == (uchar *)MAP_FAILED) {
info->s->file_map = NULL;