diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-09-28 10:09:57 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-09-28 10:09:57 -0400 |
| commit | b2ee81a6ec857a1957d5d0426ac92204fbadc3d9 (patch) | |
| tree | e5c1299c00e68e2e94b5b09c04f004c8cb389c4b /sql/mysql_priv.h | |
| parent | ca7ade8825cbc1bc3621cfb3aef3ff51d9e725ce (diff) | |
| parent | 4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff) | |
| download | mariadb-git-b2ee81a6ec857a1957d5d0426ac92204fbadc3d9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
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 5bf37d6b5f7..e15466eec9f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -578,7 +578,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 { |