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
bf75db78
Commit
bf75db78
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0 sql/sql_parse.cc: Auto merged
parents
13a23a87
8946eb3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
sql/sql_parse.cc
sql/sql_parse.cc
+6
-2
No files found.
sql/sql_parse.cc
View file @
bf75db78
...
@@ -1482,7 +1482,9 @@ mysql_execute_command(void)
...
@@ -1482,7 +1482,9 @@ mysql_execute_command(void)
}
}
case
SQLCOM_SHOW_SLAVE_STAT
:
case
SQLCOM_SHOW_SLAVE_STAT
:
{
{
if
(
check_global_access
(
thd
,
SUPER_ACL
))
/* Accept two privileges */
if
(
check_global_access
(
thd
,
SUPER_ACL
)
&&
check_global_access
(
thd
,
REPL_CLIENT_ACL
))
goto
error
;
goto
error
;
LOCK_ACTIVE_MI
;
LOCK_ACTIVE_MI
;
res
=
show_master_info
(
thd
,
active_mi
);
res
=
show_master_info
(
thd
,
active_mi
);
...
@@ -1491,7 +1493,9 @@ mysql_execute_command(void)
...
@@ -1491,7 +1493,9 @@ mysql_execute_command(void)
}
}
case
SQLCOM_SHOW_MASTER_STAT
:
case
SQLCOM_SHOW_MASTER_STAT
:
{
{
if
(
check_global_access
(
thd
,
SUPER_ACL
))
/* Accept two privileges */
if
(
check_global_access
(
thd
,
SUPER_ACL
)
&&
check_global_access
(
thd
,
REPL_CLIENT_ACL
))
goto
error
;
goto
error
;
res
=
show_binlog_info
(
thd
);
res
=
show_binlog_info
(
thd
);
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
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