diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
commit | 081fd8bfa280635a7e699a17b035032460cb5160 (patch) | |
tree | d5ea2c0f31aafe566d749f6dd60f5bc631f60862 /include | |
parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
parent | a193c5720ea461ce82390af3fe9c292581242223 (diff) | |
download | mariadb-git-081fd8bfa280635a7e699a17b035032460cb5160.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'include')
-rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index a7ab851a5fe..3d233f8b6a6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -611,7 +611,9 @@ static inline size_t my_b_bytes_in_cache(const IO_CACHE *info) return info->read_end - info->read_pos; } -int my_b_copy_to_file(IO_CACHE *cache, FILE *file); +int my_b_copy_to_file (IO_CACHE *cache, FILE *file, size_t count); +int my_b_copy_all_to_file(IO_CACHE *cache, FILE *file); + my_off_t my_b_append_tell(IO_CACHE* info); my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */ int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos); |