Commit 6efa4897 authored by davi@endora.local's avatar davi@endora.local
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
parents 3b60dc73 2af5e25c

mysql-test/r/show_check.result

+5 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/show_check.test

+19 −0
Original line number Diff line number Diff line
@@ -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

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -2271,14 +2271,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;