summaryrefslogtreecommitdiff
path: root/strings/my_vsnprintf.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-06-23 21:57:53 +0300
committerMonty <monty@mariadb.org>2016-06-23 21:57:53 +0300
commita0d9f20c0c77702d7a8a3dbc5c295e9b1eefcafa (patch)
tree15fd0e625c4d4630e974f0bdc367db5bb6bc740a /strings/my_vsnprintf.c
parentec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff)
downloadmariadb-git-bb-10.2-decimal.tar.gz
Fixed compiler warnings and test failures found by buildbotbb-10.2-decimal
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'strings/my_vsnprintf.c')
-rw-r--r--strings/my_vsnprintf.c4
1 files changed, 2 insertions, 2 deletions
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++= '"';
}