diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
| commit | 30e7d6709f7fb0f70a07c80a1a06614ca23da5f4 (patch) | |
| tree | 9ba11fd32d82ac5c1364a537532ac896c4dd2058 /sql/strfunc.cc | |
| parent | 75aabd03d57f85d63d57b25a239b4f930a3ae3c0 (diff) | |
| parent | 3bc094d32a360b7d51600cf11bc4ce24117ecb78 (diff) | |
| download | mariadb-git-30e7d6709f7fb0f70a07c80a1a06614ca23da5f4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index b09eadb098e..1c0b672fbcc 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -339,7 +339,7 @@ int find_string_in_array(LEX_CSTRING * const haystack, LEX_CSTRING * const needl if (!cs->coll->strnncollsp(cs, (uchar *) pos->str, pos->length, (uchar *) needle->str, needle->length)) { - return (pos - haystack); + return (int)(pos - haystack); } return -1; } |