diff options
| author | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 17:49:16 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 17:49:16 +0500 |
| commit | abd883f4d02e6d32c4ac0446345bd27c2455db55 (patch) | |
| tree | efea69a1a3ff61b4bda0cd7df52acd04de0bb7dc /sql/sql_acl.cc | |
| parent | 103fc806c3ab6c8840e1f8315faf6d7206a6cc2c (diff) | |
| download | mariadb-git-abd883f4d02e6d32c4ac0446345bd27c2455db55.tar.gz | |
Patch for bug#21432 is reverted
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 6ede19d0e96..0ad5432f3eb 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2640,11 +2640,7 @@ int mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, while ((Str = str_list++)) { if (Str->host.length > HOSTNAME_LENGTH || - system_charset_info->cset->charpos(system_charset_info, - Str->user.str, - Str->user.str + - Str->user.length, - USERNAME_LENGTH) < Str->user.length) + Str->user.length > USERNAME_LENGTH) { my_error(ER_GRANT_WRONG_HOST_OR_USER,MYF(0)); result= -1; |