diff options
| author | unknown <dlenev@mysql.com> | 2005-03-21 11:39:47 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-03-21 11:39:47 +0300 |
| commit | 3d8ea9d1121b5e90d8b1f230b997754ecb661ae8 (patch) | |
| tree | 8ac553656af27c618e0ad07896c6795b92bebac5 /mysys | |
| parent | 2ba3544f0e053d95e82b9a899fd9b86cbb19b9ce (diff) | |
| parent | dc79caa979bba740f43582652821bd37c3ca10b6 (diff) | |
| download | mariadb-git-3d8ea9d1121b5e90d8b1f230b997754ecb661ae8.tar.gz | |
Manual merge of csets from -build tree into main 5.0 tree.
innobase/include/data0type.ic:
Auto merged
mysql-test/r/endspace.result:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.spec.sh:
Manual merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_mmap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c index a111c3dc571..cd84630a761 100644 --- a/mysys/my_mmap.c +++ b/mysys/my_mmap.c @@ -46,11 +46,14 @@ void *my_mmap(void *addr, size_t len, int prot, 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(fd, NULL, &mmap_security_attributes, - PAGE_READWRITE, 0, len, 0); + hFileMap=CreateFileMapping(hFile, &mmap_security_attributes, + PAGE_READWRITE, 0, len, NULL); if (hFileMap == 0) return MAP_FAILED; |