mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
This commit is contained in:
commit
8946eb3d50
1 changed files with 6 additions and 2 deletions
|
@ -1475,7 +1475,9 @@ mysql_execute_command(void)
|
|||
}
|
||||
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;
|
||||
LOCK_ACTIVE_MI;
|
||||
res = show_master_info(thd,active_mi);
|
||||
|
@ -1484,7 +1486,9 @@ mysql_execute_command(void)
|
|||
}
|
||||
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;
|
||||
res = show_binlog_info(thd);
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue