Commit 1e8c450d 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/mrgOct16/50


sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
parents 4771fc36 99d42667

mysql-test/r/ps.result

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

mysql-test/r/show_check.result

+15 −0
Original line number Diff line number Diff line
@@ -630,4 +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/r/union.result

+4 −4
Original line number Diff line number Diff line
@@ -836,27 +836,27 @@ count(*) 
26

show status like 'Slow_queries';

Variable_name	Value

Slow_queries	1

Slow_queries	0

select count(*) from t1 where b=13;

count(*)

10

show status like 'Slow_queries';

Variable_name	Value

Slow_queries	3

Slow_queries	1

select count(*) from t1 where b=13 union select count(*) from t1 where a=7;

count(*)

10

26

show status like 'Slow_queries';

Variable_name	Value

Slow_queries	5

Slow_queries	2

select count(*) from t1 where a=7 union select count(*) from t1 where b=13;

count(*)

26

10

show status like 'Slow_queries';

Variable_name	Value

Slow_queries	7

Slow_queries	3

flush status;

select a from t1 where b not in (1,2,3) union select a from t1 where b not in (4,5,6);

a

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,4 +1437,18 @@ 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.