From c7150fd814603bb12a686ea0857296b92282de1b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Jul 2007 18:33:05 +0300 Subject: Bug #30036: SHOW TABLE TYPES causes the debug client to crash SHOW TABLE TYPES is a (to be deprecated) synonym for SHOW STORAGE ENGINES. Fixed to use the right schema table in addition to issuing a warning. mysql-test/r/show_check.result: Bug #30036: test case mysql-test/t/show_check.test: Bug #30036: test case sql/sql_yacc.yy: Bug #30036: use the right schema table --- mysql-test/r/show_check.result | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/r/show_check.result') diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 2bdd29602fb..83881be8ad4 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1351,4 +1351,5 @@ DROP PROCEDURE p1; DROP FUNCTION f1; DROP TABLE t1; DROP EVENT ev1; +SHOW TABLE TYPES; End of 5.1 tests -- cgit v1.2.1 From 82c87c0a44d17ff2ae723c1ac38ad103bf6949f5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jul 2007 17:55:39 +0300 Subject: Bug #30000: SHOW commands once again ends up in the slow query log Disable the SHOW commands to appear in the show query log. Update the commands type array. mysql-test/r/show_check.result: Bug #30000: test case mysql-test/t/show_check.test: Bug #30000: test case sql/sql_parse.cc: Bug #30000: skip SHOW commands from the slow query log. --- mysql-test/r/show_check.result | 70 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) (limited to 'mysql-test/r/show_check.result') diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 83881be8ad4..f84d4f3882c 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -790,13 +790,73 @@ show tables; Tables_in_test show status like 'slow_queries'; Variable_name Value -Slow_queries 1 +Slow_queries 0 select 1 from information_schema.tables limit 1; 1 1 show status like 'slow_queries'; Variable_name Value -Slow_queries 2 +Slow_queries 1 +create table t1 (a int); +create trigger tr1 before insert on t1 for each row +begin +end; +create view v1 as select a from t1; +create procedure p1() +begin +end; +create function f1() +returns int +return 0; +create event e1 on schedule every 1 year starts now() +ends date_add(now(), interval 5 hour) do +begin +end; +flush status; +show databases; +show tables; +show events; +show table status; +show open tables; +show plugins; +show columns in t1; +show slave hosts; +show keys in t1; +show column types; +show table types; +show storage engines; +show authors; +show contributors; +show privileges; +show count(*) warnings; +show count(*) errors; +show warnings; +show status; +show processlist; +show variables; +show charset; +show collation; +show grants; +show create database test; +show create table t1; +show create view v1; +show master status; +show slave status; +show create procedure p1; +show create function f1; +show create trigger tr1; +show procedure status; +show procedure code p1; +show function code f1; +show create event e1; +show status like 'slow_queries'; +Variable_name Value +Slow_queries 0 +drop view v1; +drop table t1; +drop procedure p1; +drop function f1; +drop event e1; DROP DATABASE IF EXISTS mysqltest1; DROP TABLE IF EXISTS t1; DROP VIEW IF EXISTS v1; @@ -1157,7 +1217,7 @@ select 1 from information_schema.tables limit 1; 1 show status like 'slow_queries'; Variable_name Value -Slow_queries 2 +Slow_queries 1 set global log_queries_not_using_indexes=OFF; show variables like "log_queries_not_using_indexes"; Variable_name Value @@ -1167,7 +1227,7 @@ select 1 from information_schema.tables limit 1; 1 show status like 'slow_queries'; Variable_name Value -Slow_queries 2 +Slow_queries 1 set global log_queries_not_using_indexes=ON; show variables like "log_queries_not_using_indexes"; Variable_name Value @@ -1177,7 +1237,7 @@ select 1 from information_schema.tables limit 1; 1 show status like 'slow_queries'; Variable_name Value -Slow_queries 4 +Slow_queries 2 End of 5.0 tests SHOW AUTHORS; create database mysqltest; -- cgit v1.2.1 From 9c79db318c689e97186170207f315b8accb296d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Jul 2007 08:42:43 +0300 Subject: show_check.result: Addendum to thr fix for bug 30000: show procedure/function code defined only in debug builds show_check.test: Addendum to thr fix for bug 30000: show procedure/function code defined only in debug builds mysql-test/t/show_check.test: Addendum to thr fix for bug 30000: show procedure/function code defined only in debug builds mysql-test/r/show_check.result: Addendum to thr fix for bug 30000: show procedure/function code defined only in debug builds --- mysql-test/r/show_check.result | 2 -- 1 file changed, 2 deletions(-) (limited to 'mysql-test/r/show_check.result') diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index f84d4f3882c..f4b5f2689f6 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -846,8 +846,6 @@ show create procedure p1; show create function f1; show create trigger tr1; show procedure status; -show procedure code p1; -show function code f1; show create event e1; show status like 'slow_queries'; Variable_name Value -- cgit v1.2.1