summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-02-06 00:20:46 +0100
committerSergei Golubchik <serg@mariadb.org>2018-02-06 14:51:50 +0100
commitd429f6077034682c20bc38bfb081816ab72ea992 (patch)
tree0b986a253550f6f855e55b96762f2b17f0c44f14 /storage/myisam
parent775a8a0e4b7c30ef7393108cdfae08b1f8dd64e8 (diff)
downloadmariadb-git-d429f6077034682c20bc38bfb081816ab72ea992.tar.gz
compilation error on windows
conversion from 'my_off_t' to '::size_t', possible loss of data
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/mi_locking.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 4fd287c6038..e61cd745936 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
@@ -114,7 +114,7 @@ int mi_lock_database(MI_INFO *info, int lock_type)
if (myisam_flush)
{
if (share->file_map)
- my_msync(info->dfile, share->file_map, share->mmaped_length, MS_SYNC);
+ my_msync(info->dfile, share->file_map, (size_t)share->mmaped_length, MS_SYNC);
if (mysql_file_sync(share->kfile, MYF(0)))
mark_crashed= error= my_errno;
if (mysql_file_sync(info->dfile, MYF(0)))
@@ -529,7 +529,7 @@ int _mi_writeinfo(register MI_INFO *info, uint operation)
if (myisam_flush)
{
if (share->file_map)
- my_msync(info->dfile, share->file_map, share->mmaped_length, MS_SYNC);
+ my_msync(info->dfile, share->file_map, (size_t)share->mmaped_length, MS_SYNC);
mysql_file_sync(share->kfile, 0);
mysql_file_sync(info->dfile, 0);
}