diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
| commit | a3d79f2e58562c7b50d50827a0149234c225ea43 (patch) | |
| tree | c266edef9eaf41a612e77972163d3d8eb0d280ba /mysys/mf_iocache.c | |
| parent | 8e36dde7e1f149d8973fe14d8288e678d1ba9b61 (diff) | |
| parent | a765e035a0c40ee04df42fba5c02484e83d31483 (diff) | |
| download | mariadb-git-a3d79f2e58562c7b50d50827a0149234c225ea43.tar.gz | |
Merge 10.0-serg -> 10.0
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 02e5c5373ae..3fa6ec28f7d 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1127,7 +1127,7 @@ static void copy_to_read_buffer(IO_CACHE *write_cache, */ while (write_length) { - size_t copy_length= min(write_length, write_cache->buffer_length); + size_t copy_length= MY_MIN(write_length, write_cache->buffer_length); int __attribute__((unused)) rc; rc= lock_io_cache(write_cache, write_cache->pos_in_file); @@ -1285,7 +1285,7 @@ read_append_buffer: TODO: figure out if the assert below is needed or correct. */ DBUG_ASSERT(pos_in_file == info->end_of_file); - copy_len=min(Count, len_in_buff); + copy_len=MY_MIN(Count, len_in_buff); memcpy(Buffer, info->append_read_pos, copy_len); info->append_read_pos += copy_len; Count -= copy_len; @@ -1394,7 +1394,7 @@ int _my_b_async_read(register IO_CACHE *info, uchar *Buffer, size_t Count) } #endif /* Copy found bytes to buffer */ - length=min(Count,read_length); + length=MY_MIN(Count,read_length); memcpy(Buffer,info->read_pos,(size_t) length); Buffer+=length; Count-=length; @@ -1428,7 +1428,7 @@ int _my_b_async_read(register IO_CACHE *info, uchar *Buffer, size_t Count) if ((read_length=mysql_file_read(info->file,info->request_pos, read_length, info->myflags)) == (size_t) -1) return info->error= -1; - use_length=min(Count,read_length); + use_length=MY_MIN(Count,read_length); memcpy(Buffer,info->request_pos,(size_t) use_length); info->read_pos=info->request_pos+Count; info->read_end=info->request_pos+read_length; |