summaryrefslogtreecommitdiff
path: root/sql/sql_map.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_map.cc')
-rw-r--r--sql/sql_map.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_map.cc b/sql/sql_map.cc
index 7b707f813fc..55f9b08d3fe 100644
--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@@ -37,7 +37,7 @@ mapped_files::mapped_files(const char * filename,uchar *magic,uint magic_length)
struct stat stat_buf;
if (!fstat(file,&stat_buf))
{
- if (!(map=(uchar*) my_mmap(0,(size=(ulong) stat_buf.st_size),PROT_READ,
+ if (!(map=(uchar*) my_mmap(0,(size_t)(size= stat_buf.st_size),PROT_READ,
MAP_SHARED | MAP_NORESERVE,file,
0L)))
{
@@ -48,7 +48,7 @@ mapped_files::mapped_files(const char * filename,uchar *magic,uint magic_length)
if (map && memcmp(map,magic,magic_length))
{
my_error(ER_WRONG_MAGIC, MYF(0), name);
- VOID(my_munmap((char*) map,size));
+ VOID(my_munmap((char*) map,(size_t)size));
map=0;
}
if (!map)
@@ -66,7 +66,7 @@ mapped_files::~mapped_files()
#ifdef HAVE_MMAP
if (file >= 0)
{
- VOID(my_munmap((char*) map,size));
+ VOID(my_munmap((char*) map,(size_t)size));
VOID(my_close(file,MYF(0)));
file= -1; map=0;
}