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
3ff9aa5f
Commit
3ff9aa5f
authored
May 09, 2005
by
lars@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fixes
parent
bf48175c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
sql/sql_acl.cc
sql/sql_acl.cc
+5
-5
sql/sql_parse.cc
sql/sql_parse.cc
+5
-4
No files found.
sql/sql_acl.cc
View file @
3ff9aa5f
...
...
@@ -1514,7 +1514,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
*/
tables
.
updating
=
1
;
/* Thanks to bzero, tables.next==0 */
if
(
!
rpl_filter
->
tables_ok
(
0
,
&
tables
))
if
(
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
0
,
&
tables
)
))
DBUG_RETURN
(
0
);
}
#endif
...
...
@@ -2699,7 +2699,7 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
account in tests.
*/
tables
[
0
].
updating
=
tables
[
1
].
updating
=
tables
[
2
].
updating
=
1
;
if
(
!
rpl_filter
->
tables_ok
(
0
,
tables
))
if
(
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
0
,
tables
)
))
DBUG_RETURN
(
FALSE
);
}
#endif
...
...
@@ -2904,7 +2904,7 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list,
account in tests.
*/
tables
[
0
].
updating
=
tables
[
1
].
updating
=
1
;
if
(
!
rpl_filter
->
tables_ok
(
0
,
tables
))
if
(
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
0
,
tables
)
))
DBUG_RETURN
(
FALSE
);
}
#endif
...
...
@@ -3035,7 +3035,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
account in tests.
*/
tables
[
0
].
updating
=
tables
[
1
].
updating
=
1
;
if
(
!
rpl_filter
->
tables_ok
(
0
,
tables
))
if
(
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
0
,
tables
)
))
DBUG_RETURN
(
FALSE
);
}
#endif
...
...
@@ -4245,7 +4245,7 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
*/
tables
[
0
].
updating
=
tables
[
1
].
updating
=
tables
[
2
].
updating
=
tables
[
3
].
updating
=
tables
[
4
].
updating
=
1
;
if
(
!
rpl_filter
->
tables_ok
(
0
,
tables
))
if
(
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
0
,
tables
)
))
DBUG_RETURN
(
1
);
tables
[
0
].
updating
=
tables
[
1
].
updating
=
tables
[
2
].
updating
=
tables
[
3
].
updating
=
tables
[
4
].
updating
=
0
;;
...
...
sql/sql_parse.cc
View file @
3ff9aa5f
...
...
@@ -168,11 +168,12 @@ static bool begin_trans(THD *thd)
inline
bool
all_tables_not_ok
(
THD
*
thd
,
TABLE_LIST
*
tables
)
{
return
(
rpl_filter
->
is_on
()
&&
tables
&&
!
rpl_filter
->
tables_ok
(
thd
->
db
,
tables
)
&&
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
thd
->
db
,
tables
)
)
&&
((
thd
->
lex
->
sql_command
!=
SQLCOM_DELETE_MULTI
)
||
!
rpl_filter
->
tables_ok
(
thd
->
db
,
(
TABLE_LIST
*
)
thd
->
lex
->
auxilliary_table_list
.
first
)));
!
(
thd
->
spcont
||
rpl_filter
->
tables_ok
(
thd
->
db
,
(
TABLE_LIST
*
)
thd
->
lex
->
auxilliary_table_list
.
first
))));
}
#endif
...
...
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