Skip to content

M
mariadb
Commit 0ed1cbbd authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files
Options

Porting back security fix from 4.0. 

All tests plus grant.pl test passed.
parent 7a01adf5
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sql/sql_base.cc
View file @ 0ed1cbbd
...@@ -1878,8 +1878,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, ...@@ -1878,8 +1878,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
for (; tables ; tables=tables->next) for (; tables ; tables=tables->next)
{ {
TABLE *table=tables->table; TABLE *table=tables->table;
if (grant_option && !thd->master_access && if (grant_option && !(table->grant.privilege &
check_grant_all_columns(thd,SELECT_ACL,table) ) table->grant.want_privilege) &&
check_grant_all_columns(thd,SELECT_ACL,table))
DBUG_RETURN(-1); DBUG_RETURN(-1);
if (!table_name || (!strcmp(table_name,tables->alias) && if (!table_name || (!strcmp(table_name,tables->alias) &&
(!db_name || !tables->db || (!db_name || !tables->db ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7