diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
| commit | c764bc0a78e9359fa208e074bd327f7a852c7cb7 (patch) | |
| tree | eeb5d56d225d1fdf97a016c3eae7b93c4e1f6927 /extra/mariabackup/ds_buffer.c | |
| parent | d702e463902bca7d94ff8a1a49468a5b7bdb4ba0 (diff) | |
| parent | 15795b9f9a850d9587f17ef18e1ac7b5af31ec1e (diff) | |
| download | mariadb-git-c764bc0a78e9359fa208e074bd327f7a852c7cb7.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'extra/mariabackup/ds_buffer.c')
| -rw-r--r-- | extra/mariabackup/ds_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/mariabackup/ds_buffer.c b/extra/mariabackup/ds_buffer.c index 4bb314c0f50..8e13e878953 100644 --- a/extra/mariabackup/ds_buffer.c +++ b/extra/mariabackup/ds_buffer.c @@ -45,7 +45,7 @@ typedef struct { static ds_ctxt_t *buffer_init(const char *root); static ds_file_t *buffer_open(ds_ctxt_t *ctxt, const char *path, MY_STAT *mystat); -static int buffer_write(ds_file_t *file, const void *buf, size_t len); +static int buffer_write(ds_file_t *file, const uchar *buf, size_t len); static int buffer_close(ds_file_t *file); static void buffer_deinit(ds_ctxt_t *ctxt); @@ -119,7 +119,7 @@ buffer_open(ds_ctxt_t *ctxt, const char *path, MY_STAT *mystat) } static int -buffer_write(ds_file_t *file, const void *buf, size_t len) +buffer_write(ds_file_t *file, const uchar *buf, size_t len) { ds_buffer_file_t *buffer_file; @@ -142,7 +142,7 @@ buffer_write(ds_file_t *file, const void *buf, size_t len) buffer_file->pos = 0; - buf = (const char *) buf + bytes; + buf += bytes; len -= bytes; } else { /* We don't have any buffered bytes, just write |