diff options
| author | monty@narttu.mysql.fi <> | 2003-05-14 01:28:59 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-05-14 01:28:59 +0300 |
| commit | 717cbb6da15e2eeeaf0bc37f8fd6f309a72725f9 (patch) | |
| tree | 0d274b48d1c28a43a02751dc6b3a47eabe700611 /sql | |
| parent | 3e72b423e39702fddca1f345d61069fe9b1343e3 (diff) | |
| parent | 6f9f6066f2245f956a0f74d0df8aa54b50e7a66c (diff) | |
| download | mariadb-git-717cbb6da15e2eeeaf0bc37f8fd6f309a72725f9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7496d05be50..002af61fae6 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1482,7 +1482,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); @@ -1491,7 +1493,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; |