Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
6f9f6066 · guilhem@mysql.com · f0a2ca1a · 05c89736 · 6f9f6066
Commit 6f9f6066 authored May 13, 2003 by guilhem@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +6 -2

No files found.
--- 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;