database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: indentation and whitespace fixes

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2022-09-13 10:10:36 +03:00
committed by Vicențiu-Marian Ciorbaru
parent 7735ba7666
commit 5ad8cd93b7
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_acl.cc
View File

@ -6050,7 +6050,6 @@ static int table_name_sort(GRANT_TABLE * const *tbl1, GRANT_TABLE * const *tbl2)
*/ */
static int update_role_columns(GRANT_TABLE *merged, static int update_role_columns(GRANT_TABLE *merged,
GRANT_TABLE **cur, GRANT_TABLE **last) GRANT_TABLE **cur, GRANT_TABLE **last)
{ {
ulong rights __attribute__((unused))= 0; ulong rights __attribute__((unused))= 0;
int changed= 0; int changed= 0;
@ -6611,25 +6610,25 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
/* Find/create cached table grant */ /* Find/create cached table grant */
grant_table= table_hash_search(Str->host.str, NullS, db_name, grant_table= table_hash_search(Str->host.str, NullS, db_name,
Str->user.str, table_name, 1); Str->user.str, table_name, 1);
if (!grant_table) if (!grant_table)
{ {
if (revoke_grant) if (revoke_grant)
{ {
my_error(ER_NONEXISTING_TABLE_GRANT, MYF(0), my_error(ER_NONEXISTING_TABLE_GRANT, MYF(0),
Str->user.str, Str->host.str, table_list->table_name.str); Str->user.str, Str->host.str, table_list->table_name.str);
result= TRUE; result= TRUE;
continue; continue;
} }
grant_table = new GRANT_TABLE (Str->host.str, db_name, grant_table = new GRANT_TABLE(Str->host.str, db_name,
Str->user.str, table_name, Str->user.str, table_name,
rights, rights,
column_priv); column_priv);
if (!grant_table || if (!grant_table ||
my_hash_insert(&column_priv_hash,(uchar*) grant_table)) my_hash_insert(&column_priv_hash,(uchar*) grant_table))
{ {
result= TRUE; /* purecov: deadcode */ result= TRUE; /* purecov: deadcode */
continue; /* purecov: deadcode */ continue; /* purecov: deadcode */
} }
} }
@ -6676,7 +6675,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
instead of TABLE directly. */ instead of TABLE directly. */
if (replace_table_table(thd, grant_table, tables.tables_priv_table().table(), if (replace_table_table(thd, grant_table, tables.tables_priv_table().table(),
*Str, db_name, table_name, *Str, db_name, table_name,
rights, column_priv, revoke_grant)) rights, column_priv, revoke_grant))
{ {
/* Should only happen if table is crashed */ /* Should only happen if table is crashed */
result= TRUE; /* purecov: deadcode */ result= TRUE; /* purecov: deadcode */