mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
sql_acl.cc:
Correcting problem with merge
This commit is contained in:
@@ -3683,6 +3683,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
|||||||
result= -1;
|
result= -1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
if (!grant_table->cols)
|
if (!grant_table->cols)
|
||||||
{
|
{
|
||||||
revoked= 1;
|
revoked= 1;
|
||||||
@@ -3690,10 +3691,10 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
|||||||
}
|
}
|
||||||
List<LEX_COLUMN> columns;
|
List<LEX_COLUMN> columns;
|
||||||
if (!replace_column_table(grant_table,tables[3].table, *lex_user,
|
if (!replace_column_table(grant_table,tables[3].table, *lex_user,
|
||||||
columns,
|
columns,
|
||||||
grant_table->db,
|
grant_table->db,
|
||||||
grant_table->tname,
|
grant_table->tname,
|
||||||
~0, 1))
|
~0, 1))
|
||||||
{
|
{
|
||||||
revoked= 1;
|
revoked= 1;
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user