database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into narttu.mysql.fi:/my/mysql-4.0
This commit is contained in:
monty@narttu.mysql.fi
2003-05-14 01:28:59 +03:00
parent 3e72b423e3 6f9f6066f2
commit 717cbb6da1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -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)
} }
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;