Skip to content

M
mariadb
Commit b3bab6aa authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files
Options

merge with 3.23

parents 5d5d5b08 8a28428c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_base.cc
View file @ b3bab6aa
...@@ -1984,10 +1984,10 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, ...@@ -1984,10 +1984,10 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
(!db_name || !strcmp(tables->db,db_name)))) (!db_name || !strcmp(tables->db,db_name))))
{ {
/* Ensure that we have access right to all columns */ /* Ensure that we have access right to all columns */
if (grant_option && !(table->grant.privilege & if (!(table->grant.privilege & SELECT_ACL) &&
table->grant.want_privilege) &&
check_grant_all_columns(thd,SELECT_ACL,table)) check_grant_all_columns(thd,SELECT_ACL,table))
DBUG_RETURN(-1); DBUG_RETURN(-1);
Field **ptr=table->field,*field; Field **ptr=table->field,*field;
thd->used_tables|=table->map; thd->used_tables|=table->map;
while ((field = *ptr++)) while ((field = *ptr++))
......
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