Commit bf75db78 authored by unknown's avatar unknown

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
...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment