Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
5ad8cd93
Commit
5ad8cd93
authored
Sep 13, 2022
by
Vicențiu Ciorbaru
Committed by
Vicențiu-Marian Ciorbaru
Sep 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: indentation and whitespace fixes
parent
7735ba76
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
sql/sql_acl.cc
sql/sql_acl.cc
+11
-12
No files found.
sql/sql_acl.cc
View file @
5ad8cd93
...
...
@@ -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
,
GRANT_TABLE
**
cur
,
GRANT_TABLE
**
last
)
{
ulong
rights
__attribute__
((
unused
))
=
0
;
int
changed
=
0
;
...
...
@@ -6611,25 +6610,25 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
/* Find/create cached table grant */
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
(
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
);
result
=
TRUE
;
continue
;
result
=
TRUE
;
continue
;
}
grant_table
=
new
GRANT_TABLE
(
Str
->
host
.
str
,
db_name
,
Str
->
user
.
str
,
table_name
,
rights
,
column_priv
);
grant_table
=
new
GRANT_TABLE
(
Str
->
host
.
str
,
db_name
,
Str
->
user
.
str
,
table_name
,
rights
,
column_priv
);
if
(
!
grant_table
||
my_hash_insert
(
&
column_priv_hash
,(
uchar
*
)
grant_table
))
{
result
=
TRUE
;
/* purecov: deadcode */
continue
;
/* purecov: deadcode */
result
=
TRUE
;
/* purecov: deadcode */
continue
;
/* purecov: deadcode */
}
}
...
...
@@ -6676,7 +6675,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
instead of TABLE directly. */
if
(
replace_table_table
(
thd
,
grant_table
,
tables
.
tables_priv_table
().
table
(),
*
Str
,
db_name
,
table_name
,
rights
,
column_priv
,
revoke_grant
))
rights
,
column_priv
,
revoke_grant
))
{
/* Should only happen if table is crashed */
result
=
TRUE
;
/* purecov: deadcode */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment