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

into sinisa.nasamreza.org:/mnt/work/mysql
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-04-29 15:57:13 +03:00
commit 7a01adf55a

View file

@ -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)
{
*save_priv=thd->master_access;
*save_priv=thd->master_access | thd->db_access;
return FALSE;
}
if ((want_access & ~thd->master_access) & ~(DB_ACLS | EXTRA_ACL) ||