summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authordavi@endora.local <>2008-02-06 11:22:18 -0200
committerdavi@endora.local <>2008-02-06 11:22:18 -0200
commit6efa489780bcdaba546b8cbda3ab37eb05cc6bb8 (patch)
tree5a927f6799565b202332f46a2fb9a9b6204556d7 /mysql-test
parent3b60dc73a4639bc36e2cf519befecf32a25c31e8 (diff)
parent2af5e25c1df486e5b985af54052faa907d33d374 (diff)
downloadmariadb-git-6efa489780bcdaba546b8cbda3ab37eb05cc6bb8.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/show_check.result5
-rw-r--r--mysql-test/t/show_check.test19
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index ff32d2a1512..c5fcb833933 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -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 --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 34e1941c9d7..613e9acc4c4 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -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