diff options
author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-16 18:42:22 -0600 |
---|---|---|
committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-16 18:42:22 -0600 |
commit | d0172194e37c000f80af7439aadc3279abbdcf7a (patch) | |
tree | d845ca9e66dfe15bf240642a1a947f75497a1668 /mysql-test/t/ps.test | |
parent | 4a488c06ed25e0123a084af49130b0ba35acd1f8 (diff) | |
parent | 99d42667d68a6ad5c52c6a24029477687b44f45d (diff) | |
download | mariadb-git-d0172194e37c000f80af7439aadc3279abbdcf7a.tar.gz |
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
Diffstat (limited to 'mysql-test/t/ps.test')
-rw-r--r-- | mysql-test/t/ps.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 902d8fcd9d8..62e2e9e8dd9 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -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. # |