diff options
| author | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
| commit | 84514ec643aafe74b7ac256fa485013e222f942e (patch) | |
| tree | 6f77ba0109d6764bd1fcae51dde8eec75e7ebc67 /mysys | |
| parent | 071f52839937bada46c53af23eb220e993c1e12d (diff) | |
| parent | 95f393394442437eea403d91c3c4bd68ec24fdf9 (diff) | |
| download | mariadb-git-84514ec643aafe74b7ac256fa485013e222f942e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/table.cc
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/file_logger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/file_logger.c b/mysys/file_logger.c index 078286cd7d0..35a077c4391 100644 --- a/mysys/file_logger.c +++ b/mysys/file_logger.c @@ -172,7 +172,7 @@ int logger_vprintf(LOGGER_HANDLE *log, const char* fmt, va_list ap) if (n_bytes >= sizeof(cvtbuf)) n_bytes= sizeof(cvtbuf) - 1; - result= my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0)); + result= (int)my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0)); exit: flogger_mutex_unlock(&log->lock); @@ -196,7 +196,7 @@ int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size) goto exit; /* Log rotation needed but failed */ } - result= my_write(log->file, (uchar *) buffer, size, MYF(0)); + result= (int)my_write(log->file, (uchar *) buffer, size, MYF(0)); exit: flogger_mutex_unlock(&log->lock); |