diff options
| author | gluh@gluh.(none) <> | 2006-09-28 14:09:31 +0500 |
|---|---|---|
| committer | gluh@gluh.(none) <> | 2006-09-28 14:09:31 +0500 |
| commit | b7e59b7085b3d782c06fb1a5cf8b1f639699c33d (patch) | |
| tree | 73252a3a983ef93143ce19885f926adef37d149d /sql/sql_acl.cc | |
| parent | 5e2f69d1ddda97c2de3d4c9cb52282e81cb518c1 (diff) | |
| parent | 4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff) | |
| download | mariadb-git-b7e59b7085b3d782c06fb1a5cf8b1f639699c33d.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 318f0798c5d..f293e62f9db 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -169,7 +169,7 @@ static byte* acl_entry_get_key(acl_entry *entry,uint *length, } #define IP_ADDR_STRLEN (3+1+3+1+3+1+3) -#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_BYTE_LEN+1+USERNAME_BYTE_LENGTH+1) +#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_LEN+1+USERNAME_LENGTH+1) static DYNAMIC_ARRAY acl_hosts,acl_users,acl_dbs; static MEM_ROOT mem, memex; @@ -312,7 +312,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) READ_RECORD read_record_info; my_bool return_val= 1; bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE; - char tmp_name[NAME_BYTE_LEN+1]; + char tmp_name[NAME_LEN+1]; int password_length; DBUG_ENTER("acl_load"); @@ -2401,7 +2401,7 @@ static GRANT_NAME *name_hash_search(HASH *name_hash, const char *user, const char *tname, bool exact) { - char helping [NAME_BYTE_LEN*2+USERNAME_BYTE_LENGTH+3]; + char helping [NAME_LEN*2+USERNAME_LENGTH+3]; uint len; GRANT_NAME *grant_name,*found=0; HASH_SEARCH_STATE state; @@ -3308,7 +3308,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, { List_iterator <LEX_USER> str_list (list); LEX_USER *Str, *tmp_Str; - char tmp_db[NAME_BYTE_LEN+1]; + char tmp_db[NAME_LEN+1]; bool create_new_users=0; TABLE_LIST tables[2]; DBUG_ENTER("mysql_grant"); @@ -3372,7 +3372,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, { result= TRUE; continue; - } + } if (replace_user_table(thd, tables[0].table, *Str, (!db ? rights : 0), revoke_grant, create_new_users, test(thd->variables.sql_mode & @@ -4012,7 +4012,7 @@ err2: bool check_grant_db(THD *thd,const char *db) { Security_context *sctx= thd->security_ctx; - char helping [NAME_BYTE_LEN+USERNAME_BYTE_LENGTH+2]; + char helping [NAME_LEN+USERNAME_LENGTH+2]; uint len; bool error= 1; |