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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
573c7322
Commit
573c7322
authored
Oct 17, 2013
by
Vicențiu Ciorbaru
Committed by
Sergei Golubchik
Oct 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
open_grant_tables now also opens roles_mapping table
parent
071c4ce8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
sql/sql_acl.cc
sql/sql_acl.cc
+13
-4
No files found.
sql/sql_acl.cc
View file @
573c7322
...
...
@@ -2007,7 +2007,7 @@ void rebuild_check_host(void)
my_bool
acl_user_reset_grant
(
ACL_USER
*
user
,
void
*
not_used
__attribute__
((
unused
)))
void
*
not_used
__attribute__
((
unused
)))
{
reset_dynamic
(
&
user
->
role_grants
);
return
0
;
...
...
@@ -6023,7 +6023,7 @@ void get_mqh(const char *user, const char *host, USER_CONN *uc)
SYNOPSIS
open_grant_tables()
thd The current thread.
tables (out) The
4
elements array for the opened tables.
tables (out) The
7
elements array for the opened tables.
DESCRIPTION
Tables are numbered as follows:
...
...
@@ -6031,6 +6031,9 @@ void get_mqh(const char *user, const char *host, USER_CONN *uc)
1 db
2 tables_priv
3 columns_priv
4 columns_priv
5 proxies_priv
6 roles_mapping
RETURN
1 Skip GRANT handling during replication.
...
...
@@ -6038,7 +6041,7 @@ void get_mqh(const char *user, const char *host, USER_CONN *uc)
< 0 Error.
*/
#define GRANT_TABLES
6
#define GRANT_TABLES
7
int
open_grant_tables
(
THD
*
thd
,
TABLE_LIST
*
tables
)
{
Rpl_filter
*
rpl_filter
=
thd
->
rpl_filter
;
...
...
@@ -6066,13 +6069,19 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
(
tables
+
5
)
->
init_one_table
(
C_STRING_WITH_LEN
(
"mysql"
),
C_STRING_WITH_LEN
(
"proxies_priv"
),
"proxies_priv"
,
TL_WRITE
);
tables
[
5
].
open_strategy
=
TABLE_LIST
::
OPEN_IF_EXISTS
;
(
tables
+
5
)
->
open_strategy
=
TABLE_LIST
::
OPEN_IF_EXISTS
;
(
tables
+
6
)
->
init_one_table
(
C_STRING_WITH_LEN
(
"mysql"
),
C_STRING_WITH_LEN
(
"roles_mapping"
),
"roles_mapping"
,
TL_WRITE
);
(
tables
+
6
)
->
open_strategy
=
TABLE_LIST
::
OPEN_IF_EXISTS
;
tables
->
next_local
=
tables
->
next_global
=
tables
+
1
;
(
tables
+
1
)
->
next_local
=
(
tables
+
1
)
->
next_global
=
tables
+
2
;
(
tables
+
2
)
->
next_local
=
(
tables
+
2
)
->
next_global
=
tables
+
3
;
(
tables
+
3
)
->
next_local
=
(
tables
+
3
)
->
next_global
=
tables
+
4
;
(
tables
+
4
)
->
next_local
=
(
tables
+
4
)
->
next_global
=
tables
+
5
;
(
tables
+
5
)
->
next_local
=
(
tables
+
5
)
->
next_global
=
tables
+
6
;
#ifdef HAVE_REPLICATION
/*
...
...
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