diff options
| author | unknown <msvensson@shellback.(none)> | 2006-04-06 11:38:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-04-06 11:38:50 +0200 |
| commit | 84c13fdf922e0a4c46d3bab3d142b509fd4d105e (patch) | |
| tree | f8c5ea9f052570e50c6bdf8fb581fd7c7a8148e8 /mysys | |
| parent | ee75eaa3c734183b20cef33e7dd8802680e1b845 (diff) | |
| parent | 3e2cf7664060a7dd1ef9157e26370b44f81b7bd6 (diff) | |
| download | mariadb-git-84c13fdf922e0a4c46d3bab3d142b509fd4d105e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into shellback.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
storage/csv/ha_tina.cc:
SCCS merged
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); /* |