diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-16 20:15:14 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-16 20:15:14 -0600 |
| commit | 1e8c450dea260fb3827f0d79a214c969b4abd571 (patch) | |
| tree | 3f89b2096b71b6cfb47a48455bc0cdfe62f65634 /mysql-test/r/ps.result | |
| parent | 4771fc36bca491b0e403a6f3ffe53e8973577bd8 (diff) | |
| parent | 99d42667d68a6ad5c52c6a24029477687b44f45d (diff) | |
| download | mariadb-git-1e8c450dea260fb3827f0d79a214c969b4abd571.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 048c3ae46d3..ae7784db86b 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -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. |