database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

after review changes

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2003-05-30 21:09:37 +03:00
parent bb611fa0a2
commit ac8180c2fc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_parse.cc
View File

@ -59,7 +59,7 @@ static void refresh_status(void);
static bool append_file_to_dir(THD *thd, char **filename_ptr, static bool append_file_to_dir(THD *thd, char **filename_ptr,
char *table_name); char *table_name);
inline bool single_table_command_access(THD *thd, ulong privilege, static bool single_table_command_access(THD *thd, ulong privilege,
TABLE_LIST *tables, int *res); TABLE_LIST *tables, int *res);
const char *any_db="*any*"; // Special symbol for check_access const char *any_db="*any*"; // Special symbol for check_access
@ -3123,7 +3123,7 @@ error:
1 - access denied 1 - access denied
*/ */
inline bool single_table_command_access(THD *thd, ulong privilege, static bool single_table_command_access(THD *thd, ulong privilege,
TABLE_LIST *tables, int *res) TABLE_LIST *tables, int *res)
{ {
@ -3135,12 +3135,14 @@ inline bool single_table_command_access(THD *thd, ulong privilege,
tables->next= 0; tables->next= 0;
if (grant_option && check_grant(thd, privilege, tables)) if (grant_option && check_grant(thd, privilege, tables))
return 1; return 1;
tables->next= subselects_tables;
// check rights on tables of subselect (if exists) // check rights on tables of subselect (if exists)
if (subselects_tables && if (subselects_tables)
(*res= check_table_access(thd, SELECT_ACL, subselects_tables))) {
return 1; tables->next= subselects_tables;
if ((*res= check_table_access(thd, SELECT_ACL, subselects_tables)))
return 1;
}
return 0; return 0;
} }