diff options
| author | unknown <guilhem@mysql.com> | 2003-05-13 23:03:33 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-05-13 23:03:33 +0200 |
| commit | 8946eb3d50a5c856e389b84cae3bbd2f671cecd3 (patch) | |
| tree | 039ce1f61d9d9a6017f1e2b101df828f907c965a /sql | |
| parent | 1e99e9fe96ceefc2b137bcf114f43be5bb3ce336 (diff) | |
| parent | d079990894e41dc3220156729f95557233dd88d8 (diff) | |
| download | mariadb-git-8946eb3d50a5c856e389b84cae3bbd2f671cecd3.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/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 73983bc03b1..fc30bb45ea6 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; |