diff options
| author | guilhem@mysql.com <> | 2003-05-13 23:03:33 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-05-13 23:03:33 +0200 |
| commit | 6f9f6066f2245f956a0f74d0df8aa54b50e7a66c (patch) | |
| tree | 039ce1f61d9d9a6017f1e2b101df828f907c965a /sql | |
| parent | f0a2ca1a7b3784d2982c8a285780e3131c1ff88f (diff) | |
| parent | 05c8973671b6d90acf62a29deda12ad2d87c20ba (diff) | |
| download | mariadb-git-6f9f6066f2245f956a0f74d0df8aa54b50e7a66c.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; |