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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-26 08:40:36 +03:00
parent b81382887c 4725792bf3
commit ed4b2b3f95
30 changed files with 597 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_acl.cc
View File

@ -1531,13 +1531,18 @@ class User_table_json: public User_table
{
privilege_t mask= ALL_KNOWN_ACL_100304;
ulonglong orig_access= access;
if (version_id >= 100508)
if (version_id >= 100509)
{
mask= ALL_KNOWN_ACL_100508;
mask= ALL_KNOWN_ACL_100509;
}
else if (version_id >= 100502 && version_id < 100508)
else if (version_id >= 100502)
{
mask= ALL_KNOWN_ACL_100502;
if (version_id >= 100508)
mask= ALL_KNOWN_ACL_100508;
else
mask= ALL_KNOWN_ACL_100502;
if (access & REPL_SLAVE_ADMIN_ACL)
access|= SLAVE_MONITOR_ACL;
}
else // 100501 or earlier
{