bk commit into 5.1 tree (dkatz:1.2654) BUG#32710

[damien]

Below is the list of changes that have just been committed into a local
5.1 repository of dkatz. When dkatz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-27 15:43:51-05:00, dkatz@stripped +3 -0
  Bug #32710: SHOW INNODB STATUS requires SUPER
  
  Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX" to require the PROCESS permission, instead of SUPER.

  mysql-test/r/show_check.result@stripped, 2007-12-27 15:43:45-05:00, dkatz@stripped +5 -0
    Bug #32710: SHOW INNODB STATUS requires SUPER
    
    Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX" to require the PROCESS permission, instead of SUPER.

  mysql-test/t/show_check.test@stripped, 2007-12-27 15:43:46-05:00, dkatz@stripped +19 -0
    Bug #32710: SHOW INNODB STATUS requires SUPER
    
    Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX" to require the PROCESS permission, instead of SUPER.

  sql/sql_parse.cc@stripped, 2007-12-27 15:43:46-05:00, dkatz@stripped +2 -2
    Bug #32710: SHOW INNODB STATUS requires SUPER
    
    Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX" to require the PROCESS permission, instead of SUPER.

diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-11-13 08:22:37 -05:00
+++ b/mysql-test/r/show_check.result	2007-12-27 15:43:45 -05:00
@@ -1427,4 +1427,9 @@ DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
 SHOW TABLE TYPES;
+CREATE USER test_u@localhost;
+GRANT PROCESS ON *.* TO test_u@localhost;
+SHOW ENGINE MYISAM MUTEX;
+SHOW ENGINE MYISAM STATUS;
+DROP USER test_u@localhost;
 End of 5.1 tests
diff -Nrup a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
--- a/mysql-test/t/show_check.test	2007-08-20 07:48:43 -04:00
+++ b/mysql-test/t/show_check.test	2007-12-27 15:43:46 -05:00
@@ -1115,5 +1115,24 @@ DROP EVENT ev1;
 SHOW TABLE TYPES;
 --enable_result_log
 
+#
+# Bug #32710	SHOW INNODB STATUS requires SUPER
+#
+
+
+CREATE USER test_u@localhost;
+GRANT PROCESS ON *.* TO test_u@localhost;
+
+connect (conn1, localhost, test_u,,);
+
+--disable_result_log
+SHOW ENGINE MYISAM MUTEX;
+SHOW ENGINE MYISAM STATUS;
+--enable_result_log
+
+disconnect conn1;
+connection default;
+DROP USER test_u@localhost;
+
 
 --echo End of 5.1 tests
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2007-12-17 08:28:05 -05:00
+++ b/sql/sql_parse.cc	2007-12-27 15:43:46 -05:00
@@ -2205,14 +2205,14 @@ mysql_execute_command(THD *thd)
 #endif /* HAVE_REPLICATION */
   case SQLCOM_SHOW_ENGINE_STATUS:
     {
-      if (check_global_access(thd, SUPER_ACL))
+      if (check_global_access(thd, PROCESS_ACL))
         goto error;
       res = ha_show_status(thd, lex->create_info.db_type, HA_ENGINE_STATUS);
       break;
     }
   case SQLCOM_SHOW_ENGINE_MUTEX:
     {
-      if (check_global_access(thd, SUPER_ACL))
+      if (check_global_access(thd, PROCESS_ACL))
         goto error;
       res = ha_show_status(thd, lex->create_info.db_type, HA_ENGINE_MUTEX);
       break;