Commit 10b8c5e5 authored by Sergey Vojtovich's avatar Sergey Vojtovich

Fixup: size_t written

In reply to:
ssize_t written; is sent to my_pwrite which takes size_t.  Isn't it better to use size_t to not get warnings about conversions on windows ?
parent 717c4704
...@@ -189,17 +189,19 @@ static int flush_cache(PMEM_APPEND_CACHE *cache) ...@@ -189,17 +189,19 @@ static int flush_cache(PMEM_APPEND_CACHE *cache)
(int64*) &cache->cached_eof, MY_MEMORY_ORDER_RELAXED))) (int64*) &cache->cached_eof, MY_MEMORY_ORDER_RELAXED)))
{ {
uint64_t write_size; uint64_t write_size;
ssize_t written; size_t written;
if (cached_eof / cache->buffer_size == flushed_eof / cache->buffer_size) if (cached_eof / cache->buffer_size == flushed_eof / cache->buffer_size)
write_size= cached_eof - flushed_eof; write_size= cached_eof - flushed_eof;
else else
write_size= cache->buffer_size - flushed_eof % cache->buffer_size; write_size= cache->buffer_size - flushed_eof % cache->buffer_size;
if ((written= my_pwrite(cache->file_fd, if ((written= mysql_file_pwrite(cache->file_fd,
cache->buffer + flushed_eof % cache->buffer_size, cache->buffer + flushed_eof %
write_size, flushed_eof, MYF(MY_WME))) < 0) cache->buffer_size,
write_size, flushed_eof,
MYF(MY_WME))) == MY_FILE_ERROR)
return -1; return -1;
if (my_sync(cache->file_fd, MYF(MY_WME))) if (mysql_file_sync(cache->file_fd, MYF(MY_WME)))
return -1; return -1;
flushed_eof+= written; flushed_eof+= written;
my_atomic_store64_explicit((int64*) &cache->header->flushed_eof, my_atomic_store64_explicit((int64*) &cache->header->flushed_eof,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment