Commit d0172194 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/b19764/51


mysql-test/r/union.result:
  Manual merge (use local)
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_parse.cc:
  Manual merge (use local)
sql/sql_prepare.cc:
  Manual merge (use local)
sql/sql_yacc.yy:
  SCCS merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/r/show_check.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
mysql-test/t/show_check.test:
  Manual merge
parents 4a488c06 99d42667

mysql-test/r/ps.result

+17 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,23 @@ i 
1

DEALLOCATE PREPARE stmt;

DROP TABLE t1, t2;

flush status;

prepare sq from 'show status like "slow_queries"';

execute sq;

Variable_name	Value

Slow_queries	0

prepare no_index from 'select 1 from information_schema.tables limit 1';

execute sq;

Variable_name	Value

Slow_queries	0

execute no_index;

1

1

execute sq;

Variable_name	Value

Slow_queries	1

deallocate prepare no_index;

deallocate prepare sq;

End of 5.0 tests.

create procedure proc_1() reset query cache;

call proc_1();

mysql-test/r/show_check.result

+16 −1
Original line number Diff line number Diff line
@@ -672,7 +672,22 @@ 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

End of 5.0 tests.

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

SHOW AUTHORS;

create database mysqltest;

show create database mysqltest;

mysql-test/t/ps-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/ps.test

+14 −0
Original line number Diff line number Diff line
@@ -1437,6 +1437,20 @@ DEALLOCATE PREPARE stmt; 
DROP TABLE t1, t2;





#

# Bug 19764:  SHOW commands end up in the slow log as table scans

#



flush status;

prepare sq from 'show status like "slow_queries"';

execute sq;

prepare no_index from 'select 1 from information_schema.tables limit 1';

execute sq;

execute no_index;

execute sq;

deallocate prepare no_index;

deallocate prepare sq;



--echo 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