mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
A bug fix when for SELECT ... INTO OUTFILE ....
user has table privilege and global FILE privilege
This commit is contained in:
@ -2571,8 +2571,17 @@ check_table_access(THD *thd,uint want_access,TABLE_LIST *tables,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (check_access(thd,want_access,tables->db,&tables->grant.privilege,
|
else if (check_access(thd,want_access,tables->db,&tables->grant.privilege,
|
||||||
|
0, no_errors | grant_option))
|
||||||
|
{
|
||||||
|
if (grant_option)
|
||||||
|
{
|
||||||
|
if ( check_access(thd,want_access & (uint) ~TABLE_ACLS,tables->db,&tables->grant.privilege,
|
||||||
0, no_errors))
|
0, no_errors))
|
||||||
return TRUE; // Access denied
|
return TRUE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (grant_option)
|
if (grant_option)
|
||||||
return check_grant(thd,want_access & ~EXTRA_ACL,org_tables,
|
return check_grant(thd,want_access & ~EXTRA_ACL,org_tables,
|
||||||
|
Reference in New Issue
Block a user