diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 01:37:54 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 01:37:54 +0200 |
| commit | 1acfa942edb72fedcf92dd017ae5fef8694382e5 (patch) | |
| tree | 721fcd9a479ce34633659c936f36fa1e20856620 /sql/sql_acl.cc | |
| parent | cc413ce9a368b930aba5e63c0ab013f7b3ab3c04 (diff) | |
| parent | 5a0fff50f87e20c4e95a84143a0a3bb67e03e29e (diff) | |
| download | mariadb-git-1acfa942edb72fedcf92dd017ae5fef8694382e5.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index be1425e294a..ac833e01ba7 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -8935,13 +8935,13 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, case USER_ACL: acl_user->user.str= strdup_root(&acl_memroot, user_to->user.str); acl_user->user.length= user_to->user.length; - acl_user->host.hostname= strdup_root(&acl_memroot, user_to->host.str); - acl_user->hostname_length= user_to->host.length; + update_hostname(&acl_user->host, strdup_root(&acl_memroot, user_to->host.str)); + acl_user->hostname_length= strlen(acl_user->host.hostname); break; case DB_ACL: acl_db->user= strdup_root(&acl_memroot, user_to->user.str); - acl_db->host.hostname= strdup_root(&acl_memroot, user_to->host.str); + update_hostname(&acl_db->host, strdup_root(&acl_memroot, user_to->host.str)); break; case COLUMN_PRIVILEGES_HASH: |