database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Changes to allow 5.0.3 to compile on Windows after XA was pushed

Browse Source 
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
This commit is contained in:
reggie@mdk10.(none)
2005-02-23 16:29:03 -06:00
parent 55420a8d01
commit 2ffd3a3a61
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_map.cc
View File

@ -20,7 +20,7 @@
#endif
#include "mysql_priv.h"
#ifdef HAVE_MMAP
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#include <sys/stat.h>
#endif
@ -42,7 +42,7 @@ mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_lengt
struct stat stat_buf;
if (!fstat(file,&stat_buf))
{
if (!(map=(byte*) mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,
if (!(map=(byte*) my_mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,
MAP_SHARED | MAP_NORESERVE,file,
0L)))
{
@ -53,7 +53,7 @@ mapped_files::mapped_files(const my_string filename,byte *magic,uint magic_lengt
if (map && memcmp(map,magic,magic_length))
{
my_error(ER_WRONG_MAGIC, MYF(0), name);
VOID(munmap(map,size));
VOID(my_munmap(map,size));
map=0;
}
if (!map)
@ -71,7 +71,7 @@ mapped_files::~mapped_files()
#ifdef HAVE_MMAP
if (file >= 0)
{
VOID(munmap((caddr_t) map,size));
VOID(my_munmap((caddr_t) map,size));
VOID(my_close(file,MYF(0)));
file= -1; map=0;
}