mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 01:05:30 +02:00
merge with 3.23
sql/sql_base.cc: merge
This commit is contained in:
commit
548e26cbf3
1 changed files with 2 additions and 2 deletions
|
|
@ -1984,10 +1984,10 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
|
|||
(!db_name || !strcmp(tables->db,db_name))))
|
||||
{
|
||||
/* Ensure that we have access right to all columns */
|
||||
if (grant_option && !(table->grant.privilege &
|
||||
table->grant.want_privilege) &&
|
||||
if (!(table->grant.privilege & SELECT_ACL) &&
|
||||
check_grant_all_columns(thd,SELECT_ACL,table))
|
||||
DBUG_RETURN(-1);
|
||||
|
||||
Field **ptr=table->field,*field;
|
||||
thd->used_tables|=table->map;
|
||||
while ((field = *ptr++))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue