From 05c8973671b6d90acf62a29deda12ad2d87c20ba Mon Sep 17 00:00:00 2001
From: "guilhem@mysql.com" <>
Date: Tue, 13 May 2003 23:03:00 +0200
Subject: Fix for bug 343 : we require only REPLICATION CLIENT for SHOW SLAVE
 STATUS and SHOW MASTER STATUS, because this is what the manual states. We
 still accept SUPER.

---
 sql/sql_parse.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sql')

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;
-- 
cgit v1.2.1