database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-03-03 01:37:54 +02:00
parent cc413ce9a3 5a0fff50f8
commit 1acfa942ed
154 changed files with 3475 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_acl.cc
View File

@ -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: