diff options
author | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
commit | a0d9f20c0c77702d7a8a3dbc5c295e9b1eefcafa (patch) | |
tree | 15fd0e625c4d4630e974f0bdc367db5bb6bc740a /mysys/mf_iocache.c | |
parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
download | mariadb-git-bb-10.2-decimal.tar.gz |
Fixed compiler warnings and test failures found by buildbotbb-10.2-decimal
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'mysys/mf_iocache.c')
-rw-r--r-- | mysys/mf_iocache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index db8d0b51ada..af1e0830aee 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -517,7 +517,7 @@ int _my_b_write(IO_CACHE *info, const uchar *Buffer, size_t Count) { my_off_t old_pos_in_file= info->pos_in_file; res= info->write_function(info, Buffer, Count); - Count-= info->pos_in_file - old_pos_in_file; + Count-= (size_t) (info->pos_in_file - old_pos_in_file); Buffer+= info->pos_in_file - old_pos_in_file; } else @@ -1226,7 +1226,7 @@ static int _my_b_cache_read_r(IO_CACHE *cache, uchar *Buffer, size_t Count) static void copy_to_read_buffer(IO_CACHE *write_cache, const uchar *write_buffer, my_off_t pos_in_file) { - size_t write_length= write_cache->pos_in_file - pos_in_file; + size_t write_length= (size_t) (write_cache->pos_in_file - pos_in_file); IO_CACHE_SHARE *cshare= write_cache->share; DBUG_ASSERT(cshare->source_cache == write_cache); |