diff options
author | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 20:11:11 +0500 |
---|---|---|
committer | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 20:11:11 +0500 |
commit | c316933e602dbd8144e13254bc517f4e108032c3 (patch) | |
tree | 87c6447257e8bbea4ce533d2d92fb68aa5114db6 /sql/mysql_priv.h | |
parent | c1e264a5f5bad4b3da20290ca35bc10babe9e96c (diff) | |
download | mariadb-git-c316933e602dbd8144e13254bc517f4e108032c3.tar.gz |
additional 'after merge' fix
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f293c769d75..2c8c7d7cc00 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -567,7 +567,7 @@ void get_default_definer(THD *thd, LEX_USER *definer); LEX_USER *create_default_definer(THD *thd); LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name); LEX_USER *get_current_user(THD *thd, LEX_USER *user); -bool check_string_length(CHARSET_INFO *cs, LEX_STRING *str, +bool check_string_length(LEX_STRING *str, const char *err_msg, uint max_length); enum enum_mysql_completiontype { |