Commit 28b3dba1 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_parse.cc:
  Auto merged
parents b5b5e902 0d833887

mysql-test/r/show_check.result

+17 −0
Original line number Diff line number Diff line
@@ -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.

mysql-test/t/show_check-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--log-slow-queries --log-long-format --log-queries-not-using-indexes

mysql-test/t/show_check.test

+15 −2
Original line number Diff line number Diff line
@@ -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.

sql/sql_lex.cc

+1 −0
Original line number Diff line number Diff line
@@ -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 ;

sql/sql_lex.h

+7 −0
Original line number Diff line number Diff line
@@ -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()