mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sql_acl.cc:

Browse source 
Correcting problem with merge


sql/sql_acl.cc:
  Correcting problem with merge
This commit is contained in:
unknown 2004-10-22 14:32:23 -05:00
parent 6ffd23d61f
commit 0c7ac260e0
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sql/sql_acl.cc
View file

@ -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;
@ -3705,14 +3706,14 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
} }
} while (revoked); } while (revoked);
} }
VOID(pthread_mutex_unlock(&acl_cache->lock)); VOID(pthread_mutex_unlock(&acl_cache->lock));
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
close_thread_tables(thd); close_thread_tables(thd);
if (result) if (result)
my_error(ER_REVOKE_GRANTS, MYF(0)); my_error(ER_REVOKE_GRANTS, MYF(0));
DBUG_RETURN(result); DBUG_RETURN(result);
} }