summaryrefslogtreecommitdiff
path: root/storage/myisam/sort.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-03-10 19:06:33 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-03-10 19:07:07 +0000
commitf2fe5cb2825144dcd8d2383bd38bc83fa4eafdf1 (patch)
tree531533b08d1e6a9d70ee7bbb835fce837c8de8bb /storage/myisam/sort.c
parent7c512138a19abd4d8e8761b1f0eb2bd8c9809a28 (diff)
downloadmariadb-git-f2fe5cb2825144dcd8d2383bd38bc83fa4eafdf1.tar.gz
Fix several compile warnings on Windows
Diffstat (limited to 'storage/myisam/sort.c')
-rw-r--r--storage/myisam/sort.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c
index d411272c273..0d177072ec7 100644
--- a/storage/myisam/sort.c
+++ b/storage/myisam/sort.c
@@ -869,13 +869,13 @@ static my_off_t read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
uint sort_length)
{
register ha_keys count;
- my_off_t length;
+ size_t length;
if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,
(ha_rows) buffpek->count)))
{
if (my_b_pread(fromfile, (uchar*) buffpek->base,
- (length= (my_off_t) (sort_length * count)),
+ (length= (size_t) (sort_length * count)),
buffpek->file_pos))
return(HA_OFFSET_ERROR);
buffpek->key=buffpek->base;