summaryrefslogtreecommitdiff
path: root/sql/strfunc.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-10-09 19:53:27 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-10-10 06:19:50 +0000
commitdc93ce8dea9136889f96659bbee15f9f265d6389 (patch)
treef25aecd7c24043855d427e202a80c9c6e5bfdbb2 /sql/strfunc.cc
parentfa7a1a57d9d73c0b834c86c9f366dab66b16a908 (diff)
downloadmariadb-git-dc93ce8dea9136889f96659bbee15f9f265d6389.tar.gz
Windows : Fix truncation warnings in sql/
Diffstat (limited to 'sql/strfunc.cc')
-rw-r--r--sql/strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index 4928e939e27..e1b4dc8227f 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -339,7 +339,7 @@ int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle,
if (!cs->coll->strnncollsp(cs, (uchar *) pos->str, pos->length,
(uchar *) needle->str, needle->length))
{
- return (pos - haystack);
+ return (int)(pos - haystack);
}
return -1;
}