diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-14 01:28:59 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-14 01:28:59 +0300 |
| commit | bf75db781db2327bb22f994dad6eaade9c68a4d3 (patch) | |
| tree | 0d274b48d1c28a43a02751dc6b3a47eabe700611 /sql | |
| parent | 13a23a879f3f2e9b3d09578e08802e6fe19f88f4 (diff) | |
| parent | 8946eb3d50a5c856e389b84cae3bbd2f671cecd3 (diff) | |
| download | mariadb-git-bf75db781db2327bb22f994dad6eaade9c68a4d3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
sql/sql_parse.cc:
Auto merged
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; |