Skip to content

M
mariadb
Commit 6f19b986 authored by unknown's avatar unknown
Browse files
Options

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23 

into sinisa.nasamreza.org:/mnt/work/mysql
parents 7c04ced1 930ded12
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_parse.cc
View file @ 6f19b986
...@@ -2155,7 +2155,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv, ...@@ -2155,7 +2155,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
if ((thd->master_access & want_access) == want_access) if ((thd->master_access & want_access) == want_access)
{ {
*save_priv=thd->master_access; *save_priv=thd->master_access | thd->db_access;
return FALSE; return FALSE;
} }
if ((want_access & ~thd->master_access) & ~(DB_ACLS | EXTRA_ACL) || if ((want_access & ~thd->master_access) & ~(DB_ACLS | EXTRA_ACL) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7