diff options
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index bf5fe9d6f00..01c9fe4e70b 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -331,10 +331,10 @@ outp: >=0 Ordinal position */ -int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle, +int find_string_in_array(LEX_CSTRING * const haystack, LEX_CSTRING * const needle, CHARSET_INFO * const cs) { - const LEX_STRING *pos; + const LEX_CSTRING *pos; for (pos= haystack; pos->str; pos++) if (!cs->coll->strnncollsp(cs, (uchar *) pos->str, pos->length, (uchar *) needle->str, needle->length)) @@ -345,12 +345,12 @@ int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle, } -char *set_to_string(THD *thd, LEX_STRING *result, ulonglong set, - const char *lib[]) +const char *set_to_string(THD *thd, LEX_CSTRING *result, ulonglong set, + const char *lib[]) { char buff[STRING_BUFFER_USUAL_SIZE*8]; String tmp(buff, sizeof(buff), &my_charset_latin1); - LEX_STRING unused; + LEX_CSTRING unused; if (!result) result= &unused; @@ -376,12 +376,12 @@ char *set_to_string(THD *thd, LEX_STRING *result, ulonglong set, return result->str; } -char *flagset_to_string(THD *thd, LEX_STRING *result, ulonglong set, - const char *lib[]) +const char *flagset_to_string(THD *thd, LEX_CSTRING *result, ulonglong set, + const char *lib[]) { char buff[STRING_BUFFER_USUAL_SIZE*8]; String tmp(buff, sizeof(buff), &my_charset_latin1); - LEX_STRING unused; + LEX_CSTRING unused; if (!result) result= &unused; |