database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2026-05-08 08:00:01 +02:00
parent e1972bc579 6828ff7390
commit 7598e4e95d
567 changed files with 9799 additions and 8996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@@ -3998,15 +3998,13 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
lex->exchange != NULL implies SELECT .. INTO OUTFILE and this
requires FILE_ACL access.
*/
privilege_t privileges_requested= lex->exchange ? SELECT_ACL | FILE_ACL :
SELECT_ACL;
if (lex->exchange && (res= check_global_access(thd, FILE_ACL, false)))
break;
if (all_tables)
res= check_table_access(thd,
privileges_requested,
all_tables, FALSE, UINT_MAX, FALSE);
res= check_table_access(thd, SELECT_ACL, all_tables, 0, UINT_MAX, 0);
else
res= check_access(thd, privileges_requested, any_db.str, NULL,NULL,0,0);
res= check_access(thd, SELECT_ACL, any_db.str, NULL,NULL, 0, 0);
if (!res)
res= execute_sqlcom_select(thd, all_tables);