diff options
| author | unknown <serg@serg.mylan> | 2005-03-21 13:43:25 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-21 13:43:25 +0100 |
| commit | 82182de38722242c3ec5c6b7d77bdbfe271b4bc5 (patch) | |
| tree | 3f541551d44dc65b2f4c36b38024a11680b963d9 /mysys | |
| parent | 4fd832bf9170b75354c810ad930f9cef342fb560 (diff) | |
| parent | 4ebfa64a1942ad2c221f13f63cc4ec4c1399f819 (diff) | |
| download | mariadb-git-82182de38722242c3ec5c6b7d77bdbfe271b4bc5.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
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; |