1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2006-10-11 23:38:15 -06:00
commit a71a44296e
7 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/r/show_check.result
View File

@ -630,19 +630,4 @@ SHOW TABLES FROM no_such_database;
ERROR 42000: Unknown database 'no_such_database' ERROR 42000: Unknown database 'no_such_database'
SHOW COLUMNS FROM no_such_table; SHOW COLUMNS FROM no_such_table;
ERROR 42S02: Table 'test.no_such_table' doesn't exist ERROR 42S02: Table 'test.no_such_table' doesn't exist
flush status; End of 5.0 tests
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.

1
mysql-test/t/show_check-master.opt
View File

@ -1 +0,0 @@
--log-slow-queries --log-long-format --log-queries-not-using-indexes

14
mysql-test/t/show_check.test
View File

@ -507,16 +507,4 @@ SHOW TABLES FROM no_such_database;
SHOW COLUMNS FROM no_such_table; SHOW COLUMNS FROM no_such_table;
# --echo 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.

1
sql/sql_lex.cc
View File

@ -173,7 +173,6 @@ void lex_start(THD *thd, uchar *buf,uint length)
lex->spcont= NULL; lex->spcont= NULL;
lex->proc_list.first= 0; lex->proc_list.first= 0;
lex->escape_used= FALSE; lex->escape_used= FALSE;
lex->is_show_command= FALSE;
lex->reset_query_tables_list(FALSE); lex->reset_query_tables_list(FALSE);
lex->nest_level=0 ; lex->nest_level=0 ;

7
sql/sql_lex.h
View File

@ -1016,13 +1016,6 @@ typedef struct st_lex : public Query_tables_list
bool escape_used; 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(); st_lex();
virtual ~st_lex() virtual ~st_lex()

6
sql/sql_parse.cc
View File

@ -2150,10 +2150,10 @@ void log_slow_statement(THD *thd)
thd->end_time(); // Set start time thd->end_time(); // Set start time
/* /*
Do not log administrative or SHOW statements unless the appropriate Do not log administrative statements unless the appropriate option is
option is set; do not log into slow log if reading from backup. set; do not log into slow log if reading from backup.
*/ */
if (thd->enable_slow_log && !thd->user_time && !thd->lex->is_show_command) if (thd->enable_slow_log && !thd->user_time)
{ {
thd->proc_info="logging slow query"; thd->proc_info="logging slow query";

1
sql/sql_yacc.yy
View File

@ -6412,7 +6412,6 @@ opt_table_sym:
show: SHOW show: SHOW
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->is_show_command= TRUE;
lex->wild=0; lex->wild=0;
lex->lock_option= TL_READ; lex->lock_option= TL_READ;
mysql_init_select(lex); mysql_init_select(lex);