diff options
Diffstat (limited to 'client/sql_string.cc')
| -rw-r--r-- | client/sql_string.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index dec6ac94eb2..684e9f337af 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -481,11 +481,11 @@ uint32 String::numchars() return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length); } -int String::charpos(int i,uint32 offset) +int String::charpos(longlong i,uint32 offset) { if (i <= 0) - return i; - return str_charset->cset->charpos(str_charset,Ptr+offset,Ptr+str_length,i); + return (int)i; + return (int)str_charset->cset->charpos(str_charset,Ptr+offset,Ptr+str_length,(size_t)i); } int String::strstr(const String &s,uint32 offset) |