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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2018-01-29 12:44:20 +04:00
parent b4a2baffa8 b12430adc7
commit c7a2f23a7b
56 changed files with 639 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_acl.cc
View File

@ -3025,7 +3025,8 @@ exit:
(entry= (acl_entry*) malloc(sizeof(acl_entry)+key_length)))
{
entry->access=(db_access & host_access);
entry->length=key_length;
DBUG_ASSERT(key_length < 0xffff);
entry->length=(uint16)key_length;
memcpy((uchar*) entry->key,key,key_length);
acl_cache->add(entry);
}