Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~percona-dev/percona-server/fix-714884 into lp:~percona-dev/percona-server/5.5.8

  1. fix-714884
  2. Merge into 5.5.8
Proposed by Oleg Tsarev
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 71
Proposed branch: lp:~percona-dev/percona-server/fix-714884
Merge into: lp:~percona-dev/percona-server/5.5.8
Diff against target: 458 lines (+72/-72)
7 files modified
mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result (+2/-2)
mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test (+2/-2)
mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result (+23/-23)
mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test (+15/-15)
mysql-test/response-time-distribution.patch/percona_query_response_time.result (+11/-11)
mysql-test/response-time-distribution.patch/percona_query_response_time.test (+11/-11)
response_time_distribution.patch (+8/-8)
To merge this branch: bzr merge lp:~percona-dev/percona-server/fix-714884
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Fred Linhoss (community) documentation Approve
Review via email: mp+48972@code.launchpad.net

Description of the change

Renamed "enable_query_response_time_stats" variable from response_time_distribution.patch to "query_response_time_stats" in Percona-Server 5.5.8.
This should be reflected in documentation.

To post a comment you must log in.
Revision history for this message
Fred Linhoss (fred-linhoss) wrote :

response_time_distribution wiki page updated for 5.5.8 (currently in https://intranet.percona.com/dokuwiki/per:fred:docs-5.5:response_time_distribution)

review: Approve (documentation)
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-01-17 01:49:51 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-02-08 19:59:30 +0000
@@ -22,7 +22,7 @@
22Variable_name Value22Variable_name Value
23query_response_time_range_base 1023query_response_time_range_base 10
24FLUSH QUERY_RESPONSE_TIME;24FLUSH QUERY_RESPONSE_TIME;
25SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON;25SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON;
26INSERT INTO t SELECT SLEEP(0.4);26INSERT INTO t SELECT SLEEP(0.4);
27Warnings:27Warnings:
28Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.28Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
@@ -66,5 +66,5 @@
663663
67DROP TABLE IF EXISTS t;67DROP TABLE IF EXISTS t;
68SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;68SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
69SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;69SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF;
70SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";70SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
7171
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-01-17 01:49:51 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-02-08 19:59:30 +0000
@@ -20,7 +20,7 @@
20SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;20SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
21SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';21SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
22source include/percona_query_response_time_flush.inc;22source include/percona_query_response_time_flush.inc;
23SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON;23SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON;
2424
25connection master;25connection master;
26INSERT INTO t SELECT SLEEP(0.4);26INSERT INTO t SELECT SLEEP(0.4);
@@ -53,5 +53,5 @@
53sync_slave_with_master;53sync_slave_with_master;
54connection slave;54connection slave;
55SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;55SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
56SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;56SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF;
57SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";57SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
5858
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result 2010-12-09 18:30:58 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result 2011-02-08 19:59:30 +0000
@@ -79,20 +79,20 @@
79 4194304.0000079 4194304.00000
80 8388608.0000080 8388608.00000
81TOO LONG81TOO LONG
82SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;82SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
83SELECT test_f();83SELECT test_f();
84test_f()84test_f()
85Hello, world!85Hello, world!
86SELECT test_f();86SELECT test_f();
87test_f()87test_f()
88Hello, world!88Hello, world!
89SELECT test_f();89SELECT test_f();
90test_f()90test_f()
91Hello, world!91Hello, world!
92SELECT test_f();92SELECT test_f();
93test_f()93test_f()
94Hello, world!94Hello, world!
95SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;95SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
96SELECT d.count,96SELECT d.count,
97(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,97(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
98(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,98(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -158,11 +158,11 @@
158Variable_name Value158Variable_name Value
159query_response_time_range_base 10159query_response_time_range_base 10
160FLUSH QUERY_RESPONSE_TIME;160FLUSH QUERY_RESPONSE_TIME;
161SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;161SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
162SELECT test_f();162SELECT test_f();
163test_f()163test_f()
164Hello, world!164Hello, world!
165SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;165SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
166SELECT d.count,166SELECT d.count,
167(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,167(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
168(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,168(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -198,11 +198,11 @@
198Variable_name Value198Variable_name Value
199query_response_time_range_base 7199query_response_time_range_base 7
200FLUSH QUERY_RESPONSE_TIME;200FLUSH QUERY_RESPONSE_TIME;
201SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;201SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
202SELECT test_f();202SELECT test_f();
203test_f()203test_f()
204Hello, world!204Hello, world!
205SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;205SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
206SELECT d.count,206SELECT d.count,
207(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,207(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
208(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,208(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -241,11 +241,11 @@
241Variable_name Value241Variable_name Value
242query_response_time_range_base 156242query_response_time_range_base 156
243FLUSH QUERY_RESPONSE_TIME;243FLUSH QUERY_RESPONSE_TIME;
244SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;244SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
245SELECT test_f();245SELECT test_f();
246test_f()246test_f()
247Hello, world!247Hello, world!
248SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;248SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
249SELECT d.count,249SELECT d.count,
250(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,250(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
251(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,251(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -274,11 +274,11 @@
274Variable_name Value274Variable_name Value
275query_response_time_range_base 1000275query_response_time_range_base 1000
276FLUSH QUERY_RESPONSE_TIME;276FLUSH QUERY_RESPONSE_TIME;
277SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;277SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
278SELECT test_f();278SELECT test_f();
279test_f()279test_f()
280Hello, world!280Hello, world!
281SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;281SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
282SELECT d.count,282SELECT d.count,
283(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,283(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
284(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,284(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -307,7 +307,7 @@
307SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';307SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
308Variable_name Value308Variable_name Value
309query_response_time_range_base 1000309query_response_time_range_base 1000
310SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;310SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
311SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;311SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;
312DROP FUNCTION test_f;312DROP FUNCTION test_f;
313SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";313SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
314314
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test 2011-01-17 01:49:51 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test 2011-02-08 19:59:30 +0000
@@ -26,12 +26,12 @@
26source include/percona_query_response_time_flush.inc;26source include/percona_query_response_time_flush.inc;
27source include/percona_query_response_time_show.inc;27source include/percona_query_response_time_show.inc;
2828
29SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;29SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
30SELECT test_f();30SELECT test_f();
31SELECT test_f();31SELECT test_f();
32SELECT test_f();32SELECT test_f();
33SELECT test_f();33SELECT test_f();
34SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;34SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
3535
36source include/percona_query_response_time_show.inc;36source include/percona_query_response_time_show.inc;
3737
@@ -40,9 +40,9 @@
40SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';40SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
4141
42source include/percona_query_response_time_flush.inc;42source include/percona_query_response_time_flush.inc;
43SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;43SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
44SELECT test_f();44SELECT test_f();
45SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;45SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4646
47source include/percona_query_response_time_show.inc;47source include/percona_query_response_time_show.inc;
4848
@@ -51,9 +51,9 @@
51SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';51SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
5252
53source include/percona_query_response_time_flush.inc;53source include/percona_query_response_time_flush.inc;
54SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;54SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
55SELECT test_f();55SELECT test_f();
56SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;56SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
5757
58source include/percona_query_response_time_show.inc;58source include/percona_query_response_time_show.inc;
5959
@@ -62,9 +62,9 @@
62SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';62SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
6363
64source include/percona_query_response_time_flush.inc;64source include/percona_query_response_time_flush.inc;
65SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;65SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
66SELECT test_f();66SELECT test_f();
67SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;67SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
6868
69source include/percona_query_response_time_show.inc;69source include/percona_query_response_time_show.inc;
7070
@@ -73,9 +73,9 @@
73SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';73SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
7474
75source include/percona_query_response_time_flush.inc;75source include/percona_query_response_time_flush.inc;
76SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;76SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
77SELECT test_f();77SELECT test_f();
78SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;78SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
7979
80source include/percona_query_response_time_show.inc;80source include/percona_query_response_time_show.inc;
8181
@@ -83,7 +83,7 @@
83SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;83SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
84SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';84SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
8585
86SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;86SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
87SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;87SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;
8888
89DROP FUNCTION test_f;89DROP FUNCTION test_f;
9090
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time.result 2010-12-09 18:30:58 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time.result 2011-02-08 19:59:30 +0000
@@ -66,7 +66,7 @@
66 4194304.0000066 4194304.00000
67 8388608.0000067 8388608.00000
68TOO LONG68TOO LONG
69SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;69SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
70SELECT SLEEP(0.31);70SELECT SLEEP(0.31);
71SLEEP(0.31)71SLEEP(0.31)
720720
@@ -124,7 +124,7 @@
124SELECT SLEEP(2.5);124SELECT SLEEP(2.5);
125SLEEP(2.5)125SLEEP(2.5)
12601260
127SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;127SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
128SELECT d.count,128SELECT d.count,
129(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,129(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
130(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,130(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -193,7 +193,7 @@
193Variable_name Value193Variable_name Value
194query_response_time_range_base 10194query_response_time_range_base 10
195FLUSH QUERY_RESPONSE_TIME;195FLUSH QUERY_RESPONSE_TIME;
196SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;196SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
197SELECT SLEEP(0.31);197SELECT SLEEP(0.31);
198SLEEP(0.31)198SLEEP(0.31)
19901990
@@ -251,7 +251,7 @@
251SELECT SLEEP(2.5);251SELECT SLEEP(2.5);
252SLEEP(2.5)252SLEEP(2.5)
25302530
254SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;254SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
255SELECT d.count,255SELECT d.count,
256(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,256(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
257(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,257(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -288,7 +288,7 @@
288Variable_name Value288Variable_name Value
289query_response_time_range_base 7289query_response_time_range_base 7
290FLUSH QUERY_RESPONSE_TIME;290FLUSH QUERY_RESPONSE_TIME;
291SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;291SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
292SELECT SLEEP(0.31);292SELECT SLEEP(0.31);
293SLEEP(0.31)293SLEEP(0.31)
29402940
@@ -346,7 +346,7 @@
346SELECT SLEEP(2.5);346SELECT SLEEP(2.5);
347SLEEP(2.5)347SLEEP(2.5)
34803480
349SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;349SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
350SELECT d.count,350SELECT d.count,
351(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,351(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
352(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,352(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -386,7 +386,7 @@
386Variable_name Value386Variable_name Value
387query_response_time_range_base 156387query_response_time_range_base 156
388FLUSH QUERY_RESPONSE_TIME;388FLUSH QUERY_RESPONSE_TIME;
389SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;389SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
390SELECT SLEEP(0.31);390SELECT SLEEP(0.31);
391SLEEP(0.31)391SLEEP(0.31)
39203920
@@ -444,7 +444,7 @@
444SELECT SLEEP(2.5);444SELECT SLEEP(2.5);
445SLEEP(2.5)445SLEEP(2.5)
44604460
447SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;447SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
448SELECT d.count,448SELECT d.count,
449(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,449(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
450(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,450(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -474,7 +474,7 @@
474Variable_name Value474Variable_name Value
475query_response_time_range_base 1000475query_response_time_range_base 1000
476FLUSH QUERY_RESPONSE_TIME;476FLUSH QUERY_RESPONSE_TIME;
477SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;477SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
478SELECT SLEEP(0.31);478SELECT SLEEP(0.31);
479SLEEP(0.31)479SLEEP(0.31)
48004800
@@ -532,7 +532,7 @@
532SELECT SLEEP(2.5);532SELECT SLEEP(2.5);
533SLEEP(2.5)533SLEEP(2.5)
53405340
535SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;535SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
536SELECT d.count,536SELECT d.count,
537(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,537(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
538(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,538(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
@@ -562,6 +562,6 @@
562SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';562SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
563Variable_name Value563Variable_name Value
564query_response_time_range_base 1000564query_response_time_range_base 1000
565SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;565SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
566SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;566SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;
567SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";567SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
568568
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time.test 2011-01-17 01:49:51 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time.test 2011-02-08 19:59:30 +0000
@@ -9,9 +9,9 @@
9source include/percona_query_response_time_flush.inc;9source include/percona_query_response_time_flush.inc;
10source include/percona_query_response_time_show.inc;10source include/percona_query_response_time_show.inc;
1111
12SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;12SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
13source include/percona_query_response_time_sleep.inc;13source include/percona_query_response_time_sleep.inc;
14SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;14SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1515
16source include/percona_query_response_time_show.inc;16source include/percona_query_response_time_show.inc;
1717
@@ -20,9 +20,9 @@
20SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';20SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
2121
22source include/percona_query_response_time_flush.inc;22source include/percona_query_response_time_flush.inc;
23SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;23SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
24source include/percona_query_response_time_sleep.inc;24source include/percona_query_response_time_sleep.inc;
25SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;25SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
2626
27source include/percona_query_response_time_show.inc;27source include/percona_query_response_time_show.inc;
2828
@@ -31,9 +31,9 @@
31SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';31SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
3232
33source include/percona_query_response_time_flush.inc;33source include/percona_query_response_time_flush.inc;
34SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;34SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
35source include/percona_query_response_time_sleep.inc;35source include/percona_query_response_time_sleep.inc;
36SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;36SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
3737
38source include/percona_query_response_time_show.inc;38source include/percona_query_response_time_show.inc;
3939
@@ -42,9 +42,9 @@
42SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';42SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
4343
44source include/percona_query_response_time_flush.inc;44source include/percona_query_response_time_flush.inc;
45SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;45SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
46source include/percona_query_response_time_sleep.inc;46source include/percona_query_response_time_sleep.inc;
47SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;47SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
4848
49source include/percona_query_response_time_show.inc;49source include/percona_query_response_time_show.inc;
5050
@@ -53,9 +53,9 @@
53SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';53SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
5454
55source include/percona_query_response_time_flush.inc;55source include/percona_query_response_time_flush.inc;
56SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;56SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
57source include/percona_query_response_time_sleep.inc;57source include/percona_query_response_time_sleep.inc;
58SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;58SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
5959
60source include/percona_query_response_time_show.inc;60source include/percona_query_response_time_show.inc;
6161
@@ -63,6 +63,6 @@
63SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;63SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
64SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';64SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
6565
66SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;66SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
67SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;67SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10;
68SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";68SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
6969
=== modified file 'response_time_distribution.patch'
--- response_time_distribution.patch 2011-01-17 01:49:51 +0000
+++ response_time_distribution.patch 2011-02-08 19:59:30 +0000
@@ -124,7 +124,7 @@
124 #endif124 #endif
125+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION125+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
126+ulong opt_query_response_time_range_base = QRT_DEFAULT_BASE;126+ulong opt_query_response_time_range_base = QRT_DEFAULT_BASE;
127+my_bool opt_enable_query_response_time_stats= 0;127+my_bool opt_query_response_time_stats= 0;
128+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION128+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION
129 129
130 my_bool opt_use_ssl = 0;130 my_bool opt_use_ssl = 0;
@@ -170,7 +170,7 @@
170 extern bool opt_ignore_builtin_innodb;170 extern bool opt_ignore_builtin_innodb;
171+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION171+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
172+extern ulong opt_query_response_time_range_base;172+extern ulong opt_query_response_time_range_base;
173+extern my_bool opt_enable_query_response_time_stats;173+extern my_bool opt_query_response_time_stats;
174+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION174+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION
175 extern my_bool opt_character_set_client_handshake;175 extern my_bool opt_character_set_client_handshake;
176 extern bool volatile abort_loop;176 extern bool volatile abort_loop;
@@ -653,7 +653,7 @@
653 set.653 set.
654 */654 */
655+ #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION655+ #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
656+ if (opt_enable_query_response_time_stats || thd->enable_slow_log)656+ if (opt_query_response_time_stats || thd->enable_slow_log)
657+#else // HAVE_RESPONSE_TIME_DISTRIBUTION657+#else // HAVE_RESPONSE_TIME_DISTRIBUTION
658 if (thd->enable_slow_log)658 if (thd->enable_slow_log)
659+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION659+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION
@@ -670,7 +670,7 @@
670+ ulonglong end_utime_of_query = thd->current_utime();670+ ulonglong end_utime_of_query = thd->current_utime();
671+ ulonglong query_execution_time = end_utime_of_query - thd->utime_after_lock;671+ ulonglong query_execution_time = end_utime_of_query - thd->utime_after_lock;
672+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION672+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
673+ if(opt_enable_query_response_time_stats)673+ if(opt_query_response_time_stats)
674+ {674+ {
675+ query_response_time_collect(query_execution_time);675+ query_response_time_collect(query_execution_time);
676+ }676+ }
@@ -839,16 +839,16 @@
839+ READ_ONLY GLOBAL_VAR(have_response_time_distribution), NO_CMD_LINE);839+ READ_ONLY GLOBAL_VAR(have_response_time_distribution), NO_CMD_LINE);
840+840+
841+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION841+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
842+static Sys_var_mybool Sys_enable_query_response_time_stats(842+static Sys_var_mybool Sys_query_response_time_stats(
843+ "enable_query_response_time_stats", "Enable or disable query response time statisics collecting",843+ "query_response_time_stats", "Enable or disable query response time statisics collecting",
844+ GLOBAL_VAR(opt_enable_query_response_time_stats), CMD_LINE(OPT_ARG),844+ GLOBAL_VAR(opt_query_response_time_stats), CMD_LINE(OPT_ARG),
845+ DEFAULT(FALSE));845+ DEFAULT(FALSE));
846+846+
847+static Sys_var_ulong Sys_query_response_time_range_base(847+static Sys_var_ulong Sys_query_response_time_range_base(
848+ "query_response_time_range_base",848+ "query_response_time_range_base",
849+ "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",849+ "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",
850+ GLOBAL_VAR(opt_query_response_time_range_base),850+ GLOBAL_VAR(opt_query_response_time_range_base),
851+ CMD_LINE(REQUIRED_ARG), VALID_RANGE(2, QRT_MAXIMUM_BASE),851+ CMD_LINE(OPT_ARG), VALID_RANGE(2, QRT_MAXIMUM_BASE),
852+ DEFAULT(QRT_DEFAULT_BASE),852+ DEFAULT(QRT_DEFAULT_BASE),
853+ BLOCK_SIZE(1));853+ BLOCK_SIZE(1));
854+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION854+#endif // HAVE_RESPONSE_TIME_DISTRIBUTION

Subscribers

People subscribed via source and target branches

to all changes: