summaryrefslogtreecommitdiff
path: root/extra/mariabackup/ds_tmpfile.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-03-25 13:02:52 +0200
committerSergei Golubchik <serg@mariadb.org>2018-03-25 13:02:52 +0200
commitc764bc0a78e9359fa208e074bd327f7a852c7cb7 (patch)
treeeeb5d56d225d1fdf97a016c3eae7b93c4e1f6927 /extra/mariabackup/ds_tmpfile.c
parentd702e463902bca7d94ff8a1a49468a5b7bdb4ba0 (diff)
parent15795b9f9a850d9587f17ef18e1ac7b5af31ec1e (diff)
downloadmariadb-git-c764bc0a78e9359fa208e074bd327f7a852c7cb7.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'extra/mariabackup/ds_tmpfile.c')
-rw-r--r--extra/mariabackup/ds_tmpfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/ds_tmpfile.c b/extra/mariabackup/ds_tmpfile.c
index b039d83ba03..27a8d9688f4 100644
--- a/extra/mariabackup/ds_tmpfile.c
+++ b/extra/mariabackup/ds_tmpfile.c
@@ -41,7 +41,7 @@ typedef struct {
static ds_ctxt_t *tmpfile_init(const char *root);
static ds_file_t *tmpfile_open(ds_ctxt_t *ctxt, const char *path,
MY_STAT *mystat);
-static int tmpfile_write(ds_file_t *file, const void *buf, size_t len);
+static int tmpfile_write(ds_file_t *file, const uchar *buf, size_t len);
static int tmpfile_close(ds_file_t *file);
static void tmpfile_deinit(ds_ctxt_t *ctxt);
@@ -143,7 +143,7 @@ tmpfile_open(ds_ctxt_t *ctxt, const char *path,
}
static int
-tmpfile_write(ds_file_t *file, const void *buf, size_t len)
+tmpfile_write(ds_file_t *file, const uchar *buf, size_t len)
{
File fd = ((ds_tmp_file_t *) file->ptr)->fd;