diff options
Diffstat (limited to 'sql/strfunc.h')
| -rw-r--r-- | sql/strfunc.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/strfunc.h b/sql/strfunc.h index 7b031710c76..7f3021e1a6d 100644 --- a/sql/strfunc.h +++ b/sql/strfunc.h @@ -33,12 +33,13 @@ uint find_type2(const TYPELIB *lib, const char *find, uint length, void unhex_type2(TYPELIB *lib); uint check_word(TYPELIB *lib, const char *val, const char *end, const char **end_of_word); -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); -char *flagset_to_string(THD *thd, LEX_STRING *result, ulonglong set, +const char *flagset_to_string(THD *thd, LEX_CSTRING *result, ulonglong set, const char *lib[]); -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[]); /* These functions were protected by INNODB_COMPATIBILITY_HOOKS |