diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 9ba1a0446dd..ef2277fef38 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1436,6 +1436,7 @@ DROP PROCEDURE p1;
 DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
+SHOW STORAGE ENGINES;
 CREATE USER test_u@localhost;
 GRANT PROCESS ON *.* TO test_u@localhost;
 SHOW ENGINE MYISAM MUTEX;
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index ce75d02a1cc..fa003c2fe69 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -1169,6 +1169,14 @@ DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
 
+#
+# Bug#30036 SHOW TABLE TYPES causes the debug client to crash
+#
+--disable_result_log
+SHOW STORAGE ENGINES;
+--enable_result_log
+
+
 #
 # Bug#32710 SHOW INNODB STATUS requires SUPER
 #