diff options
| author | unknown <msvensson@shellback.(none)> | 2006-04-04 10:00:27 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-04-04 10:00:27 +0200 |
| commit | 3e2cf7664060a7dd1ef9157e26370b44f81b7bd6 (patch) | |
| tree | b6db1bd1fe52a371605e9680a273a9183ed927ba /mysys | |
| parent | 90c926d99af7b82e4e32eca26f7733d3a5233006 (diff) | |
| parent | 89c8b298f0ae707a186b988dd079488f812adae0 (diff) | |
| download | mariadb-git-3e2cf7664060a7dd1ef9157e26370b44f81b7bd6.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_mmap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c index 21bfddae46c..19d9541a967 100644 --- a/mysys/my_mmap.c +++ b/mysys/my_mmap.c @@ -43,22 +43,19 @@ int my_getpagesize(void) void *my_mmap(void *addr, size_t len, int prot, int flags, int fd, my_off_t offset) { - DWORD flProtect=0; HANDLE hFileMap; LPVOID ptr; HANDLE hFile= (HANDLE)_get_osfhandle(fd); if (hFile == INVALID_HANDLE_VALUE) return MAP_FAILED; - flProtect|=SEC_COMMIT; - hFileMap=CreateFileMapping(hFile, &mmap_security_attributes, PAGE_READWRITE, 0, (DWORD) len, NULL); if (hFileMap == 0) return MAP_FAILED; ptr=MapViewOfFile(hFileMap, - flags & PROT_WRITE ? FILE_MAP_WRITE : FILE_MAP_READ, + prot & PROT_WRITE ? FILE_MAP_WRITE : FILE_MAP_READ, (DWORD)(offset >> 32), (DWORD)offset, len); /* |