diff options
| -rw-r--r-- | mysql-test/r/show_check.result | 17 | ||||
| -rw-r--r-- | mysql-test/t/show_check-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/show_check.test | 17 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 1 | ||||
| -rw-r--r-- | sql/sql_lex.h | 7 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 6 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
7 files changed, 45 insertions, 5 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 7bdfa78066c..3c90af924e4 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -520,6 +520,7 @@ t1 NULL NULL NULL NULL # # # # NULL NULL NULL NULL NULL NULL NULL NULL Incorrect show create table t1; ERROR HY000: Incorrect information in file: './test/t1.frm' drop table t1; +End of 4.1 tests CREATE TABLE txt1(a int); CREATE TABLE tyt2(a int); CREATE TABLE urkunde(a int); @@ -629,3 +630,19 @@ SHOW TABLES FROM no_such_database; ERROR 42000: Unknown database 'no_such_database' SHOW COLUMNS FROM no_such_table; ERROR 42S02: Table 'test.no_such_table' doesn't exist +flush status; +show status like 'slow_queries'; +Variable_name Value +Slow_queries 0 +show tables; +Tables_in_test +show status like 'slow_queries'; +Variable_name Value +Slow_queries 0 +select 1 from information_schema.tables limit 1; +1 +1 +show status like 'slow_queries'; +Variable_name Value +Slow_queries 1 +End of 5.0 tests. diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt new file mode 100644 index 00000000000..3eb98fc3d6b --- /dev/null +++ b/mysql-test/t/show_check-master.opt @@ -0,0 +1 @@ +--log-slow-queries --log-long-format --log-queries-not-using-indexes diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 65a81545c87..1fc22e38f73 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -400,7 +400,8 @@ show create table t1; drop table t1; -# End of 4.1 tests +--echo End of 4.1 tests + # # BUG 12183 - SHOW OPEN TABLES behavior doesn't match grammar # First we close all open tables with FLUSH tables and then we open some. @@ -506,4 +507,16 @@ SHOW TABLES FROM no_such_database; SHOW COLUMNS FROM no_such_table; -# End of 5.0 tests. +# +# Bug #19764: SHOW commands end up in the slow log as table scans +# +flush status; +show status like 'slow_queries'; +show tables; +show status like 'slow_queries'; +# Table scan query, to ensure that slow_queries does still get incremented +# (mysqld is started with --log-queries-not-using-indexes) +select 1 from information_schema.tables limit 1; +show status like 'slow_queries'; + +--echo End of 5.0 tests. diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 788276ac654..01db96291ff 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -173,6 +173,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->spcont= NULL; lex->proc_list.first= 0; lex->escape_used= FALSE; + lex->is_show_command= FALSE; lex->reset_query_tables_list(FALSE); lex->nest_level=0 ; diff --git a/sql/sql_lex.h b/sql/sql_lex.h index fdf14c691e9..1eae81732b7 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1016,6 +1016,13 @@ typedef struct st_lex : public Query_tables_list bool escape_used; + /* + Prevent SHOW commands from being written to the slow queries log. + This is fixed properly in MySQL 5.1, but a quick hack is used in 5.0 + to achieve the same result. + */ + bool is_show_command; + st_lex(); virtual ~st_lex() diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1b69e266442..1159146af95 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2150,10 +2150,10 @@ void log_slow_statement(THD *thd) thd->end_time(); // Set start time /* - Do not log administrative statements unless the appropriate option is - set; do not log into slow log if reading from backup. + Do not log administrative or SHOW statements unless the appropriate + option is set; do not log into slow log if reading from backup. */ - if (thd->enable_slow_log && !thd->user_time) + if (thd->enable_slow_log && !thd->user_time && !thd->lex->is_show_command) { thd->proc_info="logging slow query"; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index cb105d05332..3d31b37062c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6412,6 +6412,7 @@ opt_table_sym: show: SHOW { LEX *lex=Lex; + lex->is_show_command= TRUE; lex->wild=0; lex->lock_option= TL_READ; mysql_init_select(lex); |