diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 14:22:15 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 14:22:15 +0100 |
| commit | 502e2445e65929b2af881a8cfe49d8cdeb5b14e1 (patch) | |
| tree | 2ff91d17f5256b3a11c6853787619fdd29a29fcc | |
| parent | 6c279ad6a71c63cb595fde7c951aadb31c3dbebc (diff) | |
| download | mariadb-git-502e2445e65929b2af881a8cfe49d8cdeb5b14e1.tar.gz | |
Fix warnings
| -rw-r--r-- | plugin/server_audit/server_audit.c | 2 | ||||
| -rw-r--r-- | sql/strfunc.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 38046de61f9..37f0a9776c1 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -1235,7 +1235,7 @@ static int write_log(const char *message, size_t len) if (output_type == OUTPUT_FILE) { if (logfile && - (is_active= (logger_write(logfile, message, len) == len))) + (is_active= (logger_write(logfile, message, len) == (ssize_t)len))) return 0; ++log_write_failures; return 1; diff --git a/sql/strfunc.cc b/sql/strfunc.cc index 43089684061..f701c4a09ed 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -158,7 +158,7 @@ uint find_type2(const TYPELIB *typelib, const char *x, size_t length, int pos; const char *j; DBUG_ENTER("find_type2"); - DBUG_PRINT("enter",("x: '%.*s' lib: %p", length, x, typelib)); + DBUG_PRINT("enter",("x: '%.*s' lib: %p", (int)length, x, typelib)); if (!typelib->count) { |