summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-04-14 19:45:09 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2003-04-14 19:45:09 +0300
commite357610ba303f303d0a9b8652a437a4cb0a3f22e (patch)
tree08d397bf903d3f0578dde1a336833c56acc1c224 /sql/sql_parse.cc
parentca125f41b9db2082dcaa7c4e2f314516f4c05fd0 (diff)
downloadmariadb-git-e357610ba303f303d0a9b8652a437a4cb0a3f22e.tar.gz
A fix for a bug with uncached database privileges.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0ffdb68a179..29bd1393322 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2550,7 +2550,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
if ((thd->master_access & want_access) == want_access)
{
- *save_priv=thd->master_access;
+ *save_priv=thd->master_access | thd->db_access;
DBUG_RETURN(FALSE);
}
if (((want_access & ~thd->master_access) & ~(DB_ACLS | EXTRA_ACL)) ||