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

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source 
Conflicts:
	sql/table.cc
This commit is contained in:
Monty
2018-01-27 15:20:01 +02:00
parent 071f528399 95f3933944
commit 84514ec643
41 changed files with 230 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_acl.cc
View File

@ -3021,7 +3021,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);
}