diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-12 18:25:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-26 10:37:46 +0000 |
| commit | 9891ee5a2aadd2672d8d7f6b217e852344ff86eb (patch) | |
| tree | 2f5950ed243a10e36e1d8b9609c6426946fe9011 /mysys | |
| parent | 859d100d70a9dba222b229bbc0d5a01194e8ed5f (diff) | |
| download | mariadb-git-9891ee5a2aadd2672d8d7f6b217e852344ff86eb.tar.gz | |
Fix and reenable Windows compiler warning C4800 (size_t conversion).
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); |