From 4dc50758603d6ed2891412fdb6d37cd8b5541999 Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 24 Jun 2016 02:25:14 +0300 Subject: Fixed compiler warnings and test failures found by buildbot Fixed ccfilter to detect errors where the column is included in the error message --- strings/my_vsnprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'strings/my_vsnprintf.c') diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index 3cc7a4e7ea8..846803d9b24 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -495,7 +495,7 @@ start: char errmsg_buff[MYSYS_STRERROR_SIZE]; *to++= ' '; *to++= '"'; - my_strerror(errmsg_buff, sizeof(errmsg_buff), larg); + my_strerror(errmsg_buff, sizeof(errmsg_buff), (int) larg); to= process_str_arg(cs, to, real_end, width, errmsg_buff, print_arr[i].flags); if (real_end > to) *to++= '"'; @@ -675,7 +675,7 @@ size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n, char errmsg_buff[MYSYS_STRERROR_SIZE]; *to++= ' '; *to++= '"'; - my_strerror(errmsg_buff, sizeof(errmsg_buff), larg); + my_strerror(errmsg_buff, sizeof(errmsg_buff), (int) larg); to= process_str_arg(cs, to, real_end, width, errmsg_buff, print_type); if (real_end > to) *to++= '"'; } -- cgit v1.2.1