summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-10-19 17:03:26 +0200
committerunknown <knielsen@knielsen-hq.org>2010-10-19 17:03:26 +0200
commit462d14d42bb33aa5e23b5cb301ba28f56b4ca8e5 (patch)
tree1c76d5df039efabd8da14ea421682596d6e5990e /mysql-test/include
parent745cc74c3301f193c7b82c31d11c3bf0c842be9e (diff)
parentc6ccd3f34693198883d905b98638db49ea6e6a76 (diff)
downloadmariadb-git-462d14d42bb33aa5e23b5cb301ba28f56b4ca8e5.tar.gz
Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/percona_query_response_time_show.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/include/percona_query_response_time_show.inc b/mysql-test/include/percona_query_response_time_show.inc
index 761b2c6f0df..709abf9872e 100644
--- a/mysql-test/include/percona_query_response_time_show.inc
+++ b/mysql-test/include/percona_query_response_time_show.inc
@@ -1,7 +1,8 @@
-SELECT c.count,
+SELECT d.count,
(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as not_zero_region_count,
+(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
+(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
+FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;