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

Merge lp:~tsarev/percona-server/5.5_fix_bug_855312 into lp:percona-server/5.5

  1. 5.5_fix_bug_855312
  2. Merge into 5.5
Proposed by Oleg Tsarev
Status: Superseded
Proposed branch: lp:~tsarev/percona-server/5.5_fix_bug_855312
Merge into: lp:percona-server/5.5
Diff against target: 1774 lines (+1017/-92) (has conflicts)
1 file modified
patches/response_time_distribution.patch (+1017/-92)
Text conflict in patches/response_time_distribution.patch
To merge this branch: bzr merge lp:~tsarev/percona-server/5.5_fix_bug_855312
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+76346@code.launchpad.net

This proposal has been superseded by a proposal from 2011-09-22.

Description of the change

Fix bug #855312: QUERY_RESPONSE_TIME doesn't respect QUERY_RESPONSE_TIME_STATS
Fix: add check of opt_query_response_time_stats before call query_response_time_collect

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/117/

Revision history for this message
Oleg Tsarev (tsarev) wrote :

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/118/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/response_time_distribution.patch'
2--- patches/response_time_distribution.patch 2011-09-21 08:35:45 +0000
3+++ patches/response_time_distribution.patch 2011-09-21 08:37:28 +0000
4@@ -48,12 +48,14 @@
5 +enable_query_log;
6 --- /dev/null
7 +++ b/mysql-test/include/query_response_time.inc
8-@@ -0,0 +1,39 @@
9+@@ -0,0 +1,41 @@
10 +SET SESSION query_exec_time=0.1;
11 +
12 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
13 +EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
14 +FLUSH QUERY_RESPONSE_TIME;
15++SHOW QUERY_RESPONSE_TIME;
16++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
17 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
18 +
19 +SET SESSION query_exec_time=0.31; SELECT 1;
20@@ -90,7 +92,7 @@
21 +SET SESSION query_exec_time=default;
22 --- /dev/null
23 +++ b/mysql-test/include/query_response_time-replication.inc
24-@@ -0,0 +1,57 @@
25+@@ -0,0 +1,59 @@
26 +connection master;
27 +
28 +CREATE TABLE t(id INT);
29@@ -106,6 +108,8 @@
30 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
31 +--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
32 +FLUSH QUERY_RESPONSE_TIME;
33++SHOW QUERY_RESPONSE_TIME;
34++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
35 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
36 +
37 +connection master;
38@@ -150,12 +154,14 @@
39 +sync_slave_with_master;
40 --- /dev/null
41 +++ b/mysql-test/include/query_response_time-stored.inc
42-@@ -0,0 +1,37 @@
43+@@ -0,0 +1,39 @@
44 +SET SESSION query_exec_time=0.1;
45 +
46 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
47 +EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
48 +FLUSH QUERY_RESPONSE_TIME;
49++SHOW QUERY_RESPONSE_TIME;
50++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
51 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
52 +
53 +CALL test_f(0.31);
54@@ -190,7 +196,7 @@
55 +SET SESSION query_exec_time=default;
56 --- /dev/null
57 +++ b/mysql-test/r/percona_query_response_time-replication.result
58-@@ -0,0 +1,727 @@
59+@@ -0,0 +1,1031 @@
60 +SET GLOBAL query_exec_time=0.1;
61 +include/master-slave.inc
62 +[connection master]
63@@ -203,6 +209,98 @@
64 +Warnings:
65 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1'
66 +FLUSH QUERY_RESPONSE_TIME;
67++SHOW QUERY_RESPONSE_TIME;
68++
69++ 0.000001 0 0.000000
70++ 0.000003 0 0.000000
71++ 0.000007 0 0.000000
72++ 0.000015 0 0.000000
73++ 0.000030 0 0.000000
74++ 0.000061 0 0.000000
75++ 0.000122 0 0.000000
76++ 0.000244 0 0.000000
77++ 0.000488 0 0.000000
78++ 0.000976 0 0.000000
79++ 0.001953 0 0.000000
80++ 0.003906 0 0.000000
81++ 0.007812 0 0.000000
82++ 0.015625 0 0.000000
83++ 0.031250 0 0.000000
84++ 0.062500 0 0.000000
85++ 0.125000 0 0.000000
86++ 0.250000 0 0.000000
87++ 0.500000 0 0.000000
88++ 1.000000 0 0.000000
89++ 2.000000 0 0.000000
90++ 4.000000 0 0.000000
91++ 8.000000 0 0.000000
92++ 16.000000 0 0.000000
93++ 32.000000 0 0.000000
94++ 64.000000 0 0.000000
95++ 128.000000 0 0.000000
96++ 256.000000 0 0.000000
97++ 512.000000 0 0.000000
98++ 1024.000000 0 0.000000
99++ 2048.000000 0 0.000000
100++ 4096.000000 0 0.000000
101++ 8192.000000 0 0.000000
102++ 16384.000000 0 0.000000
103++ 32768.000000 0 0.000000
104++ 65536.000000 0 0.000000
105++ 131072.000000 0 0.000000
106++ 262144.000000 0 0.000000
107++ 524288.000000 0 0.000000
108++ 1048576.00000 0 0.000000
109++ 2097152.00000 0 0.000000
110++ 4194304.00000 0 0.000000
111++ 8388608.00000 0 0.000000
112++TOO LONG 0 TOO LONG
113++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
114++time count total
115++ 0.000001 0 0.000000
116++ 0.000003 0 0.000000
117++ 0.000007 0 0.000000
118++ 0.000015 0 0.000000
119++ 0.000030 0 0.000000
120++ 0.000061 0 0.000000
121++ 0.000122 0 0.000000
122++ 0.000244 0 0.000000
123++ 0.000488 0 0.000000
124++ 0.000976 0 0.000000
125++ 0.001953 0 0.000000
126++ 0.003906 0 0.000000
127++ 0.007812 0 0.000000
128++ 0.015625 0 0.000000
129++ 0.031250 0 0.000000
130++ 0.062500 0 0.000000
131++ 0.125000 0 0.000000
132++ 0.250000 0 0.000000
133++ 0.500000 0 0.000000
134++ 1.000000 0 0.000000
135++ 2.000000 0 0.000000
136++ 4.000000 0 0.000000
137++ 8.000000 0 0.000000
138++ 16.000000 0 0.000000
139++ 32.000000 0 0.000000
140++ 64.000000 0 0.000000
141++ 128.000000 0 0.000000
142++ 256.000000 0 0.000000
143++ 512.000000 0 0.000000
144++ 1024.000000 0 0.000000
145++ 2048.000000 0 0.000000
146++ 4096.000000 0 0.000000
147++ 8192.000000 0 0.000000
148++ 16384.000000 0 0.000000
149++ 32768.000000 0 0.000000
150++ 65536.000000 0 0.000000
151++ 131072.000000 0 0.000000
152++ 262144.000000 0 0.000000
153++ 524288.000000 0 0.000000
154++ 1048576.00000 0 0.000000
155++ 2097152.00000 0 0.000000
156++ 4194304.00000 0 0.000000
157++ 8388608.00000 0 0.000000
158++TOO LONG 0 TOO LONG
159 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
160 +SET SESSION query_exec_time = 0.31;
161 +INSERT INTO t VALUES(1);
162@@ -254,7 +352,7 @@
163 +query_response_time_range_base 2
164 +SHOW QUERY_RESPONSE_TIME;
165 +
166-+ 0.000001 2 0.000000
167++ 0.000001 1 0.000000
168 + 0.000003 0 0.000000
169 + 0.000007 0 0.000000
170 + 0.000015 0 0.000000
171@@ -270,7 +368,7 @@
172 + 0.015625 0 0.000000
173 + 0.031250 0 0.000000
174 + 0.062500 0 0.000000
175-+ 0.125000 3 0.300000
176++ 0.125000 1 0.100000
177 + 0.250000 0 0.000000
178 + 0.500000 30 10.650000
179 + 1.000000 3 1.500000
180@@ -300,7 +398,7 @@
181 +TOO LONG 0 TOO LONG
182 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
183 +time count total
184-+ 0.000001 2 0.000000
185++ 0.000001 1 0.000000
186 + 0.000003 0 0.000000
187 + 0.000007 0 0.000000
188 + 0.000015 0 0.000000
189@@ -316,7 +414,7 @@
190 + 0.015625 0 0.000000
191 + 0.031250 0 0.000000
192 + 0.062500 0 0.000000
193-+ 0.125000 4 0.400000
194++ 0.125000 1 0.100000
195 + 0.250000 0 0.000000
196 + 0.500000 30 10.650000
197 + 1.000000 3 1.500000
198@@ -354,6 +452,98 @@
199 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
200 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
201 +FLUSH QUERY_RESPONSE_TIME;
202++SHOW QUERY_RESPONSE_TIME;
203++
204++ 0.000001 0 0.000000
205++ 0.000003 0 0.000000
206++ 0.000007 0 0.000000
207++ 0.000015 0 0.000000
208++ 0.000030 0 0.000000
209++ 0.000061 0 0.000000
210++ 0.000122 0 0.000000
211++ 0.000244 0 0.000000
212++ 0.000488 0 0.000000
213++ 0.000976 0 0.000000
214++ 0.001953 0 0.000000
215++ 0.003906 0 0.000000
216++ 0.007812 0 0.000000
217++ 0.015625 0 0.000000
218++ 0.031250 0 0.000000
219++ 0.062500 0 0.000000
220++ 0.125000 0 0.000000
221++ 0.250000 0 0.000000
222++ 0.500000 0 0.000000
223++ 1.000000 0 0.000000
224++ 2.000000 0 0.000000
225++ 4.000000 0 0.000000
226++ 8.000000 0 0.000000
227++ 16.000000 0 0.000000
228++ 32.000000 0 0.000000
229++ 64.000000 0 0.000000
230++ 128.000000 0 0.000000
231++ 256.000000 0 0.000000
232++ 512.000000 0 0.000000
233++ 1024.000000 0 0.000000
234++ 2048.000000 0 0.000000
235++ 4096.000000 0 0.000000
236++ 8192.000000 0 0.000000
237++ 16384.000000 0 0.000000
238++ 32768.000000 0 0.000000
239++ 65536.000000 0 0.000000
240++ 131072.000000 0 0.000000
241++ 262144.000000 0 0.000000
242++ 524288.000000 0 0.000000
243++ 1048576.00000 0 0.000000
244++ 2097152.00000 0 0.000000
245++ 4194304.00000 0 0.000000
246++ 8388608.00000 0 0.000000
247++TOO LONG 0 TOO LONG
248++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
249++time count total
250++ 0.000001 0 0.000000
251++ 0.000003 0 0.000000
252++ 0.000007 0 0.000000
253++ 0.000015 0 0.000000
254++ 0.000030 0 0.000000
255++ 0.000061 0 0.000000
256++ 0.000122 0 0.000000
257++ 0.000244 0 0.000000
258++ 0.000488 0 0.000000
259++ 0.000976 0 0.000000
260++ 0.001953 0 0.000000
261++ 0.003906 0 0.000000
262++ 0.007812 0 0.000000
263++ 0.015625 0 0.000000
264++ 0.031250 0 0.000000
265++ 0.062500 0 0.000000
266++ 0.125000 0 0.000000
267++ 0.250000 0 0.000000
268++ 0.500000 0 0.000000
269++ 1.000000 0 0.000000
270++ 2.000000 0 0.000000
271++ 4.000000 0 0.000000
272++ 8.000000 0 0.000000
273++ 16.000000 0 0.000000
274++ 32.000000 0 0.000000
275++ 64.000000 0 0.000000
276++ 128.000000 0 0.000000
277++ 256.000000 0 0.000000
278++ 512.000000 0 0.000000
279++ 1024.000000 0 0.000000
280++ 2048.000000 0 0.000000
281++ 4096.000000 0 0.000000
282++ 8192.000000 0 0.000000
283++ 16384.000000 0 0.000000
284++ 32768.000000 0 0.000000
285++ 65536.000000 0 0.000000
286++ 131072.000000 0 0.000000
287++ 262144.000000 0 0.000000
288++ 524288.000000 0 0.000000
289++ 1048576.00000 0 0.000000
290++ 2097152.00000 0 0.000000
291++ 4194304.00000 0 0.000000
292++ 8388608.00000 0 0.000000
293++TOO LONG 0 TOO LONG
294 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
295 +SET SESSION query_exec_time = 0.31;
296 +INSERT INTO t VALUES(1);
297@@ -405,7 +595,7 @@
298 +query_response_time_range_base 2
299 +SHOW QUERY_RESPONSE_TIME;
300 +
301-+ 0.000001 2 0.000000
302++ 0.000001 1 0.000000
303 + 0.000003 0 0.000000
304 + 0.000007 0 0.000000
305 + 0.000015 0 0.000000
306@@ -421,7 +611,7 @@
307 + 0.015625 0 0.000000
308 + 0.031250 0 0.000000
309 + 0.062500 0 0.000000
310-+ 0.125000 3 0.300000
311++ 0.125000 1 0.100000
312 + 0.250000 0 0.000000
313 + 0.500000 30 10.650000
314 + 1.000000 3 1.500000
315@@ -451,7 +641,7 @@
316 +TOO LONG 0 TOO LONG
317 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
318 +time count total
319-+ 0.000001 2 0.000000
320++ 0.000001 1 0.000000
321 + 0.000003 0 0.000000
322 + 0.000007 0 0.000000
323 + 0.000015 0 0.000000
324@@ -467,7 +657,7 @@
325 + 0.015625 0 0.000000
326 + 0.031250 0 0.000000
327 + 0.062500 0 0.000000
328-+ 0.125000 4 0.400000
329++ 0.125000 1 0.100000
330 + 0.250000 0 0.000000
331 + 0.500000 30 10.650000
332 + 1.000000 3 1.500000
333@@ -505,6 +695,38 @@
334 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
335 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
336 +FLUSH QUERY_RESPONSE_TIME;
337++SHOW QUERY_RESPONSE_TIME;
338++
339++ 0.000001 0 0.000000
340++ 0.000010 0 0.000000
341++ 0.000100 0 0.000000
342++ 0.001000 0 0.000000
343++ 0.010000 0 0.000000
344++ 0.100000 0 0.000000
345++ 1.000000 0 0.000000
346++ 10.000000 0 0.000000
347++ 100.000000 0 0.000000
348++ 1000.000000 0 0.000000
349++ 10000.000000 0 0.000000
350++ 100000.000000 0 0.000000
351++ 1000000.00000 0 0.000000
352++TOO LONG 0 TOO LONG
353++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
354++time count total
355++ 0.000001 0 0.000000
356++ 0.000010 0 0.000000
357++ 0.000100 0 0.000000
358++ 0.001000 0 0.000000
359++ 0.010000 0 0.000000
360++ 0.100000 0 0.000000
361++ 1.000000 0 0.000000
362++ 10.000000 0 0.000000
363++ 100.000000 0 0.000000
364++ 1000.000000 0 0.000000
365++ 10000.000000 0 0.000000
366++ 100000.000000 0 0.000000
367++ 1000000.00000 0 0.000000
368++TOO LONG 0 TOO LONG
369 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
370 +SET SESSION query_exec_time = 0.31;
371 +INSERT INTO t VALUES(1);
372@@ -556,13 +778,13 @@
373 +query_response_time_range_base 10
374 +SHOW QUERY_RESPONSE_TIME;
375 +
376-+ 0.000001 2 0.000000
377++ 0.000001 1 0.000000
378 + 0.000010 0 0.000000
379 + 0.000100 0 0.000000
380 + 0.001000 0 0.000000
381 + 0.010000 0 0.000000
382 + 0.100000 0 0.000000
383-+ 1.000000 36 12.450000
384++ 1.000000 34 12.250000
385 + 10.000000 33 77.099997
386 + 100.000000 0 0.000000
387 + 1000.000000 0 0.000000
388@@ -572,13 +794,13 @@
389 +TOO LONG 0 TOO LONG
390 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
391 +time count total
392-+ 0.000001 2 0.000000
393++ 0.000001 1 0.000000
394 + 0.000010 0 0.000000
395 + 0.000100 0 0.000000
396 + 0.001000 0 0.000000
397 + 0.010000 0 0.000000
398 + 0.100000 0 0.000000
399-+ 1.000000 37 12.550000
400++ 1.000000 34 12.250000
401 + 10.000000 33 77.099997
402 + 100.000000 0 0.000000
403 + 1000.000000 0 0.000000
404@@ -596,6 +818,44 @@
405 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
406 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
407 +FLUSH QUERY_RESPONSE_TIME;
408++SHOW QUERY_RESPONSE_TIME;
409++
410++ 0.000001 0 0.000000
411++ 0.000008 0 0.000000
412++ 0.000059 0 0.000000
413++ 0.000416 0 0.000000
414++ 0.002915 0 0.000000
415++ 0.020408 0 0.000000
416++ 0.142857 0 0.000000
417++ 1.000000 0 0.000000
418++ 7.000000 0 0.000000
419++ 49.000000 0 0.000000
420++ 343.000000 0 0.000000
421++ 2401.000000 0 0.000000
422++ 16807.000000 0 0.000000
423++ 117649.000000 0 0.000000
424++ 823543.000000 0 0.000000
425++ 5764801.00000 0 0.000000
426++TOO LONG 0 TOO LONG
427++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
428++time count total
429++ 0.000001 0 0.000000
430++ 0.000008 0 0.000000
431++ 0.000059 0 0.000000
432++ 0.000416 0 0.000000
433++ 0.002915 0 0.000000
434++ 0.020408 0 0.000000
435++ 0.142857 0 0.000000
436++ 1.000000 0 0.000000
437++ 7.000000 0 0.000000
438++ 49.000000 0 0.000000
439++ 343.000000 0 0.000000
440++ 2401.000000 0 0.000000
441++ 16807.000000 0 0.000000
442++ 117649.000000 0 0.000000
443++ 823543.000000 0 0.000000
444++ 5764801.00000 0 0.000000
445++TOO LONG 0 TOO LONG
446 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
447 +SET SESSION query_exec_time = 0.31;
448 +INSERT INTO t VALUES(1);
449@@ -647,13 +907,13 @@
450 +query_response_time_range_base 7
451 +SHOW QUERY_RESPONSE_TIME;
452 +
453-+ 0.000001 2 0.000000
454++ 0.000001 1 0.000000
455 + 0.000008 0 0.000000
456 + 0.000059 0 0.000000
457 + 0.000416 0 0.000000
458 + 0.002915 0 0.000000
459 + 0.020408 0 0.000000
460-+ 0.142857 3 0.300000
461++ 0.142857 1 0.100000
462 + 1.000000 33 12.150000
463 + 7.000000 33 77.099997
464 + 49.000000 0 0.000000
465@@ -666,13 +926,13 @@
466 +TOO LONG 0 TOO LONG
467 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
468 +time count total
469-+ 0.000001 2 0.000000
470++ 0.000001 1 0.000000
471 + 0.000008 0 0.000000
472 + 0.000059 0 0.000000
473 + 0.000416 0 0.000000
474 + 0.002915 0 0.000000
475 + 0.020408 0 0.000000
476-+ 0.142857 4 0.400000
477++ 0.142857 1 0.100000
478 + 1.000000 33 12.150000
479 + 7.000000 33 77.099997
480 + 49.000000 0 0.000000
481@@ -693,6 +953,24 @@
482 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
483 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
484 +FLUSH QUERY_RESPONSE_TIME;
485++SHOW QUERY_RESPONSE_TIME;
486++
487++ 0.000041 0 0.000000
488++ 0.006410 0 0.000000
489++ 1.000000 0 0.000000
490++ 156.000000 0 0.000000
491++ 24336.000000 0 0.000000
492++ 3796416.00000 0 0.000000
493++TOO LONG 0 TOO LONG
494++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
495++time count total
496++ 0.000041 0 0.000000
497++ 0.006410 0 0.000000
498++ 1.000000 0 0.000000
499++ 156.000000 0 0.000000
500++ 24336.000000 0 0.000000
501++ 3796416.00000 0 0.000000
502++TOO LONG 0 TOO LONG
503 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
504 +SET SESSION query_exec_time = 0.31;
505 +INSERT INTO t VALUES(1);
506@@ -744,18 +1022,18 @@
507 +query_response_time_range_base 156
508 +SHOW QUERY_RESPONSE_TIME;
509 +
510-+ 0.000041 2 0.000000
511++ 0.000041 1 0.000000
512 + 0.006410 0 0.000000
513-+ 1.000000 36 12.450000
514++ 1.000000 34 12.250000
515 + 156.000000 33 77.099997
516 + 24336.000000 0 0.000000
517 + 3796416.00000 0 0.000000
518 +TOO LONG 0 TOO LONG
519 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
520 +time count total
521-+ 0.000041 2 0.000000
522++ 0.000041 1 0.000000
523 + 0.006410 0 0.000000
524-+ 1.000000 37 12.550000
525++ 1.000000 34 12.250000
526 + 156.000000 33 77.099997
527 + 24336.000000 0 0.000000
528 + 3796416.00000 0 0.000000
529@@ -770,6 +1048,22 @@
530 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
531 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
532 +FLUSH QUERY_RESPONSE_TIME;
533++SHOW QUERY_RESPONSE_TIME;
534++
535++ 0.000001 0 0.000000
536++ 0.001000 0 0.000000
537++ 1.000000 0 0.000000
538++ 1000.000000 0 0.000000
539++ 1000000.00000 0 0.000000
540++TOO LONG 0 TOO LONG
541++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
542++time count total
543++ 0.000001 0 0.000000
544++ 0.001000 0 0.000000
545++ 1.000000 0 0.000000
546++ 1000.000000 0 0.000000
547++ 1000000.00000 0 0.000000
548++TOO LONG 0 TOO LONG
549 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
550 +SET SESSION query_exec_time = 0.31;
551 +INSERT INTO t VALUES(1);
552@@ -821,17 +1115,17 @@
553 +query_response_time_range_base 1000
554 +SHOW QUERY_RESPONSE_TIME;
555 +
556-+ 0.000001 2 0.000000
557++ 0.000001 1 0.000000
558 + 0.001000 0 0.000000
559-+ 1.000000 36 12.450000
560++ 1.000000 34 12.250000
561 + 1000.000000 33 77.099997
562 + 1000000.00000 0 0.000000
563 +TOO LONG 0 TOO LONG
564 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
565 +time count total
566-+ 0.000001 2 0.000000
567++ 0.000001 1 0.000000
568 + 0.001000 0 0.000000
569-+ 1.000000 37 12.550000
570++ 1.000000 34 12.250000
571 + 1000.000000 33 77.099997
572 + 1000000.00000 0 0.000000
573 +TOO LONG 0 TOO LONG
574@@ -847,6 +1141,22 @@
575 +Warnings:
576 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1001'
577 +FLUSH QUERY_RESPONSE_TIME;
578++SHOW QUERY_RESPONSE_TIME;
579++
580++ 0.000001 0 0.000000
581++ 0.001000 0 0.000000
582++ 1.000000 0 0.000000
583++ 1000.000000 0 0.000000
584++ 1000000.00000 0 0.000000
585++TOO LONG 0 TOO LONG
586++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
587++time count total
588++ 0.000001 0 0.000000
589++ 0.001000 0 0.000000
590++ 1.000000 0 0.000000
591++ 1000.000000 0 0.000000
592++ 1000000.00000 0 0.000000
593++TOO LONG 0 TOO LONG
594 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
595 +SET SESSION query_exec_time = 0.31;
596 +INSERT INTO t VALUES(1);
597@@ -898,17 +1208,17 @@
598 +query_response_time_range_base 1000
599 +SHOW QUERY_RESPONSE_TIME;
600 +
601-+ 0.000001 2 0.000000
602++ 0.000001 1 0.000000
603 + 0.001000 0 0.000000
604-+ 1.000000 36 12.450000
605++ 1.000000 34 12.250000
606 + 1000.000000 33 77.099997
607 + 1000000.00000 0 0.000000
608 +TOO LONG 0 TOO LONG
609 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
610 +time count total
611-+ 0.000001 2 0.000000
612++ 0.000001 1 0.000000
613 + 0.001000 0 0.000000
614-+ 1.000000 37 12.550000
615++ 1.000000 34 12.250000
616 + 1000.000000 33 77.099997
617 + 1000000.00000 0 0.000000
618 +TOO LONG 0 TOO LONG
619@@ -920,13 +1230,105 @@
620 +SET GLOBAL query_exec_time=default;
621 --- /dev/null
622 +++ b/mysql-test/r/percona_query_response_time.result
623-@@ -0,0 +1,1003 @@
624+@@ -0,0 +1,1307 @@
625 +SET SESSION query_exec_time=0.1;
626 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
627 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1;
628 +Warnings:
629 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1'
630 +FLUSH QUERY_RESPONSE_TIME;
631++SHOW QUERY_RESPONSE_TIME;
632++
633++ 0.000001 0 0.000000
634++ 0.000003 0 0.000000
635++ 0.000007 0 0.000000
636++ 0.000015 0 0.000000
637++ 0.000030 0 0.000000
638++ 0.000061 0 0.000000
639++ 0.000122 0 0.000000
640++ 0.000244 0 0.000000
641++ 0.000488 0 0.000000
642++ 0.000976 0 0.000000
643++ 0.001953 0 0.000000
644++ 0.003906 0 0.000000
645++ 0.007812 0 0.000000
646++ 0.015625 0 0.000000
647++ 0.031250 0 0.000000
648++ 0.062500 0 0.000000
649++ 0.125000 0 0.000000
650++ 0.250000 0 0.000000
651++ 0.500000 0 0.000000
652++ 1.000000 0 0.000000
653++ 2.000000 0 0.000000
654++ 4.000000 0 0.000000
655++ 8.000000 0 0.000000
656++ 16.000000 0 0.000000
657++ 32.000000 0 0.000000
658++ 64.000000 0 0.000000
659++ 128.000000 0 0.000000
660++ 256.000000 0 0.000000
661++ 512.000000 0 0.000000
662++ 1024.000000 0 0.000000
663++ 2048.000000 0 0.000000
664++ 4096.000000 0 0.000000
665++ 8192.000000 0 0.000000
666++ 16384.000000 0 0.000000
667++ 32768.000000 0 0.000000
668++ 65536.000000 0 0.000000
669++ 131072.000000 0 0.000000
670++ 262144.000000 0 0.000000
671++ 524288.000000 0 0.000000
672++ 1048576.00000 0 0.000000
673++ 2097152.00000 0 0.000000
674++ 4194304.00000 0 0.000000
675++ 8388608.00000 0 0.000000
676++TOO LONG 0 TOO LONG
677++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
678++time count total
679++ 0.000001 0 0.000000
680++ 0.000003 0 0.000000
681++ 0.000007 0 0.000000
682++ 0.000015 0 0.000000
683++ 0.000030 0 0.000000
684++ 0.000061 0 0.000000
685++ 0.000122 0 0.000000
686++ 0.000244 0 0.000000
687++ 0.000488 0 0.000000
688++ 0.000976 0 0.000000
689++ 0.001953 0 0.000000
690++ 0.003906 0 0.000000
691++ 0.007812 0 0.000000
692++ 0.015625 0 0.000000
693++ 0.031250 0 0.000000
694++ 0.062500 0 0.000000
695++ 0.125000 0 0.000000
696++ 0.250000 0 0.000000
697++ 0.500000 0 0.000000
698++ 1.000000 0 0.000000
699++ 2.000000 0 0.000000
700++ 4.000000 0 0.000000
701++ 8.000000 0 0.000000
702++ 16.000000 0 0.000000
703++ 32.000000 0 0.000000
704++ 64.000000 0 0.000000
705++ 128.000000 0 0.000000
706++ 256.000000 0 0.000000
707++ 512.000000 0 0.000000
708++ 1024.000000 0 0.000000
709++ 2048.000000 0 0.000000
710++ 4096.000000 0 0.000000
711++ 8192.000000 0 0.000000
712++ 16384.000000 0 0.000000
713++ 32768.000000 0 0.000000
714++ 65536.000000 0 0.000000
715++ 131072.000000 0 0.000000
716++ 262144.000000 0 0.000000
717++ 524288.000000 0 0.000000
718++ 1048576.00000 0 0.000000
719++ 2097152.00000 0 0.000000
720++ 4194304.00000 0 0.000000
721++ 8388608.00000 0 0.000000
722++TOO LONG 0 TOO LONG
723 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
724 +SET SESSION query_exec_time=0.31;
725 +SELECT 1;
726@@ -1023,7 +1425,7 @@
727 +query_response_time_range_base 2
728 +SHOW QUERY_RESPONSE_TIME;
729 +
730-+ 0.000001 25 0.000000
731++ 0.000001 24 0.000000
732 + 0.000003 0 0.000000
733 + 0.000007 0 0.000000
734 + 0.000015 0 0.000000
735@@ -1039,7 +1441,7 @@
736 + 0.015625 0 0.000000
737 + 0.031250 0 0.000000
738 + 0.062500 0 0.000000
739-+ 0.125000 2 0.200000
740++ 0.125000 0 0.000000
741 + 0.250000 0 0.000000
742 + 0.500000 10 3.550000
743 + 1.000000 1 0.500000
744@@ -1069,7 +1471,7 @@
745 +TOO LONG 0 TOO LONG
746 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
747 +time count total
748-+ 0.000001 25 0.000000
749++ 0.000001 24 0.000000
750 + 0.000003 0 0.000000
751 + 0.000007 0 0.000000
752 + 0.000015 0 0.000000
753@@ -1085,7 +1487,7 @@
754 + 0.015625 0 0.000000
755 + 0.031250 0 0.000000
756 + 0.062500 0 0.000000
757-+ 0.125000 3 0.300000
758++ 0.125000 0 0.000000
759 + 0.250000 0 0.000000
760 + 0.500000 10 3.550000
761 + 1.000000 1 0.500000
762@@ -1118,6 +1520,98 @@
763 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
764 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
765 +FLUSH QUERY_RESPONSE_TIME;
766++SHOW QUERY_RESPONSE_TIME;
767++
768++ 0.000001 0 0.000000
769++ 0.000003 0 0.000000
770++ 0.000007 0 0.000000
771++ 0.000015 0 0.000000
772++ 0.000030 0 0.000000
773++ 0.000061 0 0.000000
774++ 0.000122 0 0.000000
775++ 0.000244 0 0.000000
776++ 0.000488 0 0.000000
777++ 0.000976 0 0.000000
778++ 0.001953 0 0.000000
779++ 0.003906 0 0.000000
780++ 0.007812 0 0.000000
781++ 0.015625 0 0.000000
782++ 0.031250 0 0.000000
783++ 0.062500 0 0.000000
784++ 0.125000 0 0.000000
785++ 0.250000 0 0.000000
786++ 0.500000 0 0.000000
787++ 1.000000 0 0.000000
788++ 2.000000 0 0.000000
789++ 4.000000 0 0.000000
790++ 8.000000 0 0.000000
791++ 16.000000 0 0.000000
792++ 32.000000 0 0.000000
793++ 64.000000 0 0.000000
794++ 128.000000 0 0.000000
795++ 256.000000 0 0.000000
796++ 512.000000 0 0.000000
797++ 1024.000000 0 0.000000
798++ 2048.000000 0 0.000000
799++ 4096.000000 0 0.000000
800++ 8192.000000 0 0.000000
801++ 16384.000000 0 0.000000
802++ 32768.000000 0 0.000000
803++ 65536.000000 0 0.000000
804++ 131072.000000 0 0.000000
805++ 262144.000000 0 0.000000
806++ 524288.000000 0 0.000000
807++ 1048576.00000 0 0.000000
808++ 2097152.00000 0 0.000000
809++ 4194304.00000 0 0.000000
810++ 8388608.00000 0 0.000000
811++TOO LONG 0 TOO LONG
812++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
813++time count total
814++ 0.000001 0 0.000000
815++ 0.000003 0 0.000000
816++ 0.000007 0 0.000000
817++ 0.000015 0 0.000000
818++ 0.000030 0 0.000000
819++ 0.000061 0 0.000000
820++ 0.000122 0 0.000000
821++ 0.000244 0 0.000000
822++ 0.000488 0 0.000000
823++ 0.000976 0 0.000000
824++ 0.001953 0 0.000000
825++ 0.003906 0 0.000000
826++ 0.007812 0 0.000000
827++ 0.015625 0 0.000000
828++ 0.031250 0 0.000000
829++ 0.062500 0 0.000000
830++ 0.125000 0 0.000000
831++ 0.250000 0 0.000000
832++ 0.500000 0 0.000000
833++ 1.000000 0 0.000000
834++ 2.000000 0 0.000000
835++ 4.000000 0 0.000000
836++ 8.000000 0 0.000000
837++ 16.000000 0 0.000000
838++ 32.000000 0 0.000000
839++ 64.000000 0 0.000000
840++ 128.000000 0 0.000000
841++ 256.000000 0 0.000000
842++ 512.000000 0 0.000000
843++ 1024.000000 0 0.000000
844++ 2048.000000 0 0.000000
845++ 4096.000000 0 0.000000
846++ 8192.000000 0 0.000000
847++ 16384.000000 0 0.000000
848++ 32768.000000 0 0.000000
849++ 65536.000000 0 0.000000
850++ 131072.000000 0 0.000000
851++ 262144.000000 0 0.000000
852++ 524288.000000 0 0.000000
853++ 1048576.00000 0 0.000000
854++ 2097152.00000 0 0.000000
855++ 4194304.00000 0 0.000000
856++ 8388608.00000 0 0.000000
857++TOO LONG 0 TOO LONG
858 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
859 +SET SESSION query_exec_time=0.31;
860 +SELECT 1;
861@@ -1214,7 +1708,7 @@
862 +query_response_time_range_base 2
863 +SHOW QUERY_RESPONSE_TIME;
864 +
865-+ 0.000001 25 0.000000
866++ 0.000001 24 0.000000
867 + 0.000003 0 0.000000
868 + 0.000007 0 0.000000
869 + 0.000015 0 0.000000
870@@ -1230,7 +1724,7 @@
871 + 0.015625 0 0.000000
872 + 0.031250 0 0.000000
873 + 0.062500 0 0.000000
874-+ 0.125000 2 0.200000
875++ 0.125000 0 0.000000
876 + 0.250000 0 0.000000
877 + 0.500000 10 3.550000
878 + 1.000000 1 0.500000
879@@ -1260,7 +1754,7 @@
880 +TOO LONG 0 TOO LONG
881 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
882 +time count total
883-+ 0.000001 25 0.000000
884++ 0.000001 24 0.000000
885 + 0.000003 0 0.000000
886 + 0.000007 0 0.000000
887 + 0.000015 0 0.000000
888@@ -1276,7 +1770,7 @@
889 + 0.015625 0 0.000000
890 + 0.031250 0 0.000000
891 + 0.062500 0 0.000000
892-+ 0.125000 3 0.300000
893++ 0.125000 0 0.000000
894 + 0.250000 0 0.000000
895 + 0.500000 10 3.550000
896 + 1.000000 1 0.500000
897@@ -1309,6 +1803,38 @@
898 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
899 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
900 +FLUSH QUERY_RESPONSE_TIME;
901++SHOW QUERY_RESPONSE_TIME;
902++
903++ 0.000001 0 0.000000
904++ 0.000010 0 0.000000
905++ 0.000100 0 0.000000
906++ 0.001000 0 0.000000
907++ 0.010000 0 0.000000
908++ 0.100000 0 0.000000
909++ 1.000000 0 0.000000
910++ 10.000000 0 0.000000
911++ 100.000000 0 0.000000
912++ 1000.000000 0 0.000000
913++ 10000.000000 0 0.000000
914++ 100000.000000 0 0.000000
915++ 1000000.00000 0 0.000000
916++TOO LONG 0 TOO LONG
917++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
918++time count total
919++ 0.000001 0 0.000000
920++ 0.000010 0 0.000000
921++ 0.000100 0 0.000000
922++ 0.001000 0 0.000000
923++ 0.010000 0 0.000000
924++ 0.100000 0 0.000000
925++ 1.000000 0 0.000000
926++ 10.000000 0 0.000000
927++ 100.000000 0 0.000000
928++ 1000.000000 0 0.000000
929++ 10000.000000 0 0.000000
930++ 100000.000000 0 0.000000
931++ 1000000.00000 0 0.000000
932++TOO LONG 0 TOO LONG
933 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
934 +SET SESSION query_exec_time=0.31;
935 +SELECT 1;
936@@ -1405,13 +1931,13 @@
937 +query_response_time_range_base 10
938 +SHOW QUERY_RESPONSE_TIME;
939 +
940-+ 0.000001 25 0.000000
941++ 0.000001 24 0.000000
942 + 0.000010 0 0.000000
943 + 0.000100 0 0.000000
944 + 0.001000 0 0.000000
945 + 0.010000 0 0.000000
946 + 0.100000 0 0.000000
947-+ 1.000000 13 4.250000
948++ 1.000000 11 4.050000
949 + 10.000000 11 25.699999
950 + 100.000000 0 0.000000
951 + 1000.000000 0 0.000000
952@@ -1421,13 +1947,13 @@
953 +TOO LONG 0 TOO LONG
954 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
955 +time count total
956-+ 0.000001 25 0.000000
957++ 0.000001 24 0.000000
958 + 0.000010 0 0.000000
959 + 0.000100 0 0.000000
960 + 0.001000 0 0.000000
961 + 0.010000 0 0.000000
962 + 0.100000 0 0.000000
963-+ 1.000000 14 4.350000
964++ 1.000000 11 4.050000
965 + 10.000000 11 25.699999
966 + 100.000000 0 0.000000
967 + 1000.000000 0 0.000000
968@@ -1440,6 +1966,44 @@
969 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
970 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
971 +FLUSH QUERY_RESPONSE_TIME;
972++SHOW QUERY_RESPONSE_TIME;
973++
974++ 0.000001 0 0.000000
975++ 0.000008 0 0.000000
976++ 0.000059 0 0.000000
977++ 0.000416 0 0.000000
978++ 0.002915 0 0.000000
979++ 0.020408 0 0.000000
980++ 0.142857 0 0.000000
981++ 1.000000 0 0.000000
982++ 7.000000 0 0.000000
983++ 49.000000 0 0.000000
984++ 343.000000 0 0.000000
985++ 2401.000000 0 0.000000
986++ 16807.000000 0 0.000000
987++ 117649.000000 0 0.000000
988++ 823543.000000 0 0.000000
989++ 5764801.00000 0 0.000000
990++TOO LONG 0 TOO LONG
991++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
992++time count total
993++ 0.000001 0 0.000000
994++ 0.000008 0 0.000000
995++ 0.000059 0 0.000000
996++ 0.000416 0 0.000000
997++ 0.002915 0 0.000000
998++ 0.020408 0 0.000000
999++ 0.142857 0 0.000000
1000++ 1.000000 0 0.000000
1001++ 7.000000 0 0.000000
1002++ 49.000000 0 0.000000
1003++ 343.000000 0 0.000000
1004++ 2401.000000 0 0.000000
1005++ 16807.000000 0 0.000000
1006++ 117649.000000 0 0.000000
1007++ 823543.000000 0 0.000000
1008++ 5764801.00000 0 0.000000
1009++TOO LONG 0 TOO LONG
1010 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1011 +SET SESSION query_exec_time=0.31;
1012 +SELECT 1;
1013@@ -1536,13 +2100,13 @@
1014 +query_response_time_range_base 7
1015 +SHOW QUERY_RESPONSE_TIME;
1016 +
1017-+ 0.000001 25 0.000000
1018++ 0.000001 24 0.000000
1019 + 0.000008 0 0.000000
1020 + 0.000059 0 0.000000
1021 + 0.000416 0 0.000000
1022 + 0.002915 0 0.000000
1023 + 0.020408 0 0.000000
1024-+ 0.142857 2 0.200000
1025++ 0.142857 0 0.000000
1026 + 1.000000 11 4.050000
1027 + 7.000000 11 25.699999
1028 + 49.000000 0 0.000000
1029@@ -1555,13 +2119,13 @@
1030 +TOO LONG 0 TOO LONG
1031 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1032 +time count total
1033-+ 0.000001 25 0.000000
1034++ 0.000001 24 0.000000
1035 + 0.000008 0 0.000000
1036 + 0.000059 0 0.000000
1037 + 0.000416 0 0.000000
1038 + 0.002915 0 0.000000
1039 + 0.020408 0 0.000000
1040-+ 0.142857 3 0.300000
1041++ 0.142857 0 0.000000
1042 + 1.000000 11 4.050000
1043 + 7.000000 11 25.699999
1044 + 49.000000 0 0.000000
1045@@ -1577,6 +2141,24 @@
1046 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1047 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
1048 +FLUSH QUERY_RESPONSE_TIME;
1049++SHOW QUERY_RESPONSE_TIME;
1050++
1051++ 0.000041 0 0.000000
1052++ 0.006410 0 0.000000
1053++ 1.000000 0 0.000000
1054++ 156.000000 0 0.000000
1055++ 24336.000000 0 0.000000
1056++ 3796416.00000 0 0.000000
1057++TOO LONG 0 TOO LONG
1058++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1059++time count total
1060++ 0.000041 0 0.000000
1061++ 0.006410 0 0.000000
1062++ 1.000000 0 0.000000
1063++ 156.000000 0 0.000000
1064++ 24336.000000 0 0.000000
1065++ 3796416.00000 0 0.000000
1066++TOO LONG 0 TOO LONG
1067 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1068 +SET SESSION query_exec_time=0.31;
1069 +SELECT 1;
1070@@ -1673,18 +2255,18 @@
1071 +query_response_time_range_base 156
1072 +SHOW QUERY_RESPONSE_TIME;
1073 +
1074-+ 0.000041 25 0.000000
1075++ 0.000041 24 0.000000
1076 + 0.006410 0 0.000000
1077-+ 1.000000 13 4.250000
1078++ 1.000000 11 4.050000
1079 + 156.000000 11 25.699999
1080 + 24336.000000 0 0.000000
1081 + 3796416.00000 0 0.000000
1082 +TOO LONG 0 TOO LONG
1083 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1084 +time count total
1085-+ 0.000041 25 0.000000
1086++ 0.000041 24 0.000000
1087 + 0.006410 0 0.000000
1088-+ 1.000000 14 4.350000
1089++ 1.000000 11 4.050000
1090 + 156.000000 11 25.699999
1091 + 24336.000000 0 0.000000
1092 + 3796416.00000 0 0.000000
1093@@ -1694,6 +2276,22 @@
1094 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1095 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
1096 +FLUSH QUERY_RESPONSE_TIME;
1097++SHOW QUERY_RESPONSE_TIME;
1098++
1099++ 0.000001 0 0.000000
1100++ 0.001000 0 0.000000
1101++ 1.000000 0 0.000000
1102++ 1000.000000 0 0.000000
1103++ 1000000.00000 0 0.000000
1104++TOO LONG 0 TOO LONG
1105++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1106++time count total
1107++ 0.000001 0 0.000000
1108++ 0.001000 0 0.000000
1109++ 1.000000 0 0.000000
1110++ 1000.000000 0 0.000000
1111++ 1000000.00000 0 0.000000
1112++TOO LONG 0 TOO LONG
1113 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1114 +SET SESSION query_exec_time=0.31;
1115 +SELECT 1;
1116@@ -1790,17 +2388,17 @@
1117 +query_response_time_range_base 1000
1118 +SHOW QUERY_RESPONSE_TIME;
1119 +
1120-+ 0.000001 25 0.000000
1121++ 0.000001 24 0.000000
1122 + 0.001000 0 0.000000
1123-+ 1.000000 13 4.250000
1124++ 1.000000 11 4.050000
1125 + 1000.000000 11 25.699999
1126 + 1000000.00000 0 0.000000
1127 +TOO LONG 0 TOO LONG
1128 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1129 +time count total
1130-+ 0.000001 25 0.000000
1131++ 0.000001 24 0.000000
1132 + 0.001000 0 0.000000
1133-+ 1.000000 14 4.350000
1134++ 1.000000 11 4.050000
1135 + 1000.000000 11 25.699999
1136 + 1000000.00000 0 0.000000
1137 +TOO LONG 0 TOO LONG
1138@@ -1811,6 +2409,22 @@
1139 +Warnings:
1140 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1001'
1141 +FLUSH QUERY_RESPONSE_TIME;
1142++SHOW QUERY_RESPONSE_TIME;
1143++
1144++ 0.000001 0 0.000000
1145++ 0.001000 0 0.000000
1146++ 1.000000 0 0.000000
1147++ 1000.000000 0 0.000000
1148++ 1000000.00000 0 0.000000
1149++TOO LONG 0 TOO LONG
1150++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1151++time count total
1152++ 0.000001 0 0.000000
1153++ 0.001000 0 0.000000
1154++ 1.000000 0 0.000000
1155++ 1000.000000 0 0.000000
1156++ 1000000.00000 0 0.000000
1157++TOO LONG 0 TOO LONG
1158 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1159 +SET SESSION query_exec_time=0.31;
1160 +SELECT 1;
1161@@ -1907,17 +2521,17 @@
1162 +query_response_time_range_base 1000
1163 +SHOW QUERY_RESPONSE_TIME;
1164 +
1165-+ 0.000001 25 0.000000
1166++ 0.000001 24 0.000000
1167 + 0.001000 0 0.000000
1168-+ 1.000000 13 4.250000
1169++ 1.000000 11 4.050000
1170 + 1000.000000 11 25.699999
1171 + 1000000.00000 0 0.000000
1172 +TOO LONG 0 TOO LONG
1173 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1174 +time count total
1175-+ 0.000001 25 0.000000
1176++ 0.000001 24 0.000000
1177 + 0.001000 0 0.000000
1178-+ 1.000000 14 4.350000
1179++ 1.000000 11 4.050000
1180 + 1000.000000 11 25.699999
1181 + 1000000.00000 0 0.000000
1182 +TOO LONG 0 TOO LONG
1183@@ -1926,7 +2540,7 @@
1184 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
1185 --- /dev/null
1186 +++ b/mysql-test/r/percona_query_response_time-stored.result
1187-@@ -0,0 +1,544 @@
1188+@@ -0,0 +1,848 @@
1189 +CREATE TABLE t(a INT);
1190 +CREATE PROCEDURE test_f(t DECIMAL(3,2))
1191 +BEGIN
1192@@ -1941,6 +2555,98 @@
1193 +Warnings:
1194 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1'
1195 +FLUSH QUERY_RESPONSE_TIME;
1196++SHOW QUERY_RESPONSE_TIME;
1197++
1198++ 0.000001 0 0.000000
1199++ 0.000003 0 0.000000
1200++ 0.000007 0 0.000000
1201++ 0.000015 0 0.000000
1202++ 0.000030 0 0.000000
1203++ 0.000061 0 0.000000
1204++ 0.000122 0 0.000000
1205++ 0.000244 0 0.000000
1206++ 0.000488 0 0.000000
1207++ 0.000976 0 0.000000
1208++ 0.001953 0 0.000000
1209++ 0.003906 0 0.000000
1210++ 0.007812 0 0.000000
1211++ 0.015625 0 0.000000
1212++ 0.031250 0 0.000000
1213++ 0.062500 0 0.000000
1214++ 0.125000 0 0.000000
1215++ 0.250000 0 0.000000
1216++ 0.500000 0 0.000000
1217++ 1.000000 0 0.000000
1218++ 2.000000 0 0.000000
1219++ 4.000000 0 0.000000
1220++ 8.000000 0 0.000000
1221++ 16.000000 0 0.000000
1222++ 32.000000 0 0.000000
1223++ 64.000000 0 0.000000
1224++ 128.000000 0 0.000000
1225++ 256.000000 0 0.000000
1226++ 512.000000 0 0.000000
1227++ 1024.000000 0 0.000000
1228++ 2048.000000 0 0.000000
1229++ 4096.000000 0 0.000000
1230++ 8192.000000 0 0.000000
1231++ 16384.000000 0 0.000000
1232++ 32768.000000 0 0.000000
1233++ 65536.000000 0 0.000000
1234++ 131072.000000 0 0.000000
1235++ 262144.000000 0 0.000000
1236++ 524288.000000 0 0.000000
1237++ 1048576.00000 0 0.000000
1238++ 2097152.00000 0 0.000000
1239++ 4194304.00000 0 0.000000
1240++ 8388608.00000 0 0.000000
1241++TOO LONG 0 TOO LONG
1242++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1243++time count total
1244++ 0.000001 0 0.000000
1245++ 0.000003 0 0.000000
1246++ 0.000007 0 0.000000
1247++ 0.000015 0 0.000000
1248++ 0.000030 0 0.000000
1249++ 0.000061 0 0.000000
1250++ 0.000122 0 0.000000
1251++ 0.000244 0 0.000000
1252++ 0.000488 0 0.000000
1253++ 0.000976 0 0.000000
1254++ 0.001953 0 0.000000
1255++ 0.003906 0 0.000000
1256++ 0.007812 0 0.000000
1257++ 0.015625 0 0.000000
1258++ 0.031250 0 0.000000
1259++ 0.062500 0 0.000000
1260++ 0.125000 0 0.000000
1261++ 0.250000 0 0.000000
1262++ 0.500000 0 0.000000
1263++ 1.000000 0 0.000000
1264++ 2.000000 0 0.000000
1265++ 4.000000 0 0.000000
1266++ 8.000000 0 0.000000
1267++ 16.000000 0 0.000000
1268++ 32.000000 0 0.000000
1269++ 64.000000 0 0.000000
1270++ 128.000000 0 0.000000
1271++ 256.000000 0 0.000000
1272++ 512.000000 0 0.000000
1273++ 1024.000000 0 0.000000
1274++ 2048.000000 0 0.000000
1275++ 4096.000000 0 0.000000
1276++ 8192.000000 0 0.000000
1277++ 16384.000000 0 0.000000
1278++ 32768.000000 0 0.000000
1279++ 65536.000000 0 0.000000
1280++ 131072.000000 0 0.000000
1281++ 262144.000000 0 0.000000
1282++ 524288.000000 0 0.000000
1283++ 1048576.00000 0 0.000000
1284++ 2097152.00000 0 0.000000
1285++ 4194304.00000 0 0.000000
1286++ 8388608.00000 0 0.000000
1287++TOO LONG 0 TOO LONG
1288 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1289 +CALL test_f(0.31);
1290 +CALL test_f(0.32);
1291@@ -1970,7 +2676,7 @@
1292 +query_response_time_range_base 2
1293 +SHOW QUERY_RESPONSE_TIME;
1294 +
1295-+ 0.000001 46 0.000000
1296++ 0.000001 45 0.000000
1297 + 0.000003 0 0.000000
1298 + 0.000007 0 0.000000
1299 + 0.000015 0 0.000000
1300@@ -1986,7 +2692,7 @@
1301 + 0.015625 0 0.000000
1302 + 0.031250 0 0.000000
1303 + 0.062500 0 0.000000
1304-+ 0.125000 46 4.600000
1305++ 0.125000 44 4.400000
1306 + 0.250000 0 0.000000
1307 + 0.500000 10 3.550000
1308 + 1.000000 1 0.500000
1309@@ -2016,7 +2722,7 @@
1310 +TOO LONG 0 TOO LONG
1311 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1312 +time count total
1313-+ 0.000001 46 0.000000
1314++ 0.000001 45 0.000000
1315 + 0.000003 0 0.000000
1316 + 0.000007 0 0.000000
1317 + 0.000015 0 0.000000
1318@@ -2032,7 +2738,7 @@
1319 + 0.015625 0 0.000000
1320 + 0.031250 0 0.000000
1321 + 0.062500 0 0.000000
1322-+ 0.125000 47 4.700000
1323++ 0.125000 44 4.400000
1324 + 0.250000 0 0.000000
1325 + 0.500000 10 3.550000
1326 + 1.000000 1 0.500000
1327@@ -2065,6 +2771,98 @@
1328 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1329 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
1330 +FLUSH QUERY_RESPONSE_TIME;
1331++SHOW QUERY_RESPONSE_TIME;
1332++
1333++ 0.000001 0 0.000000
1334++ 0.000003 0 0.000000
1335++ 0.000007 0 0.000000
1336++ 0.000015 0 0.000000
1337++ 0.000030 0 0.000000
1338++ 0.000061 0 0.000000
1339++ 0.000122 0 0.000000
1340++ 0.000244 0 0.000000
1341++ 0.000488 0 0.000000
1342++ 0.000976 0 0.000000
1343++ 0.001953 0 0.000000
1344++ 0.003906 0 0.000000
1345++ 0.007812 0 0.000000
1346++ 0.015625 0 0.000000
1347++ 0.031250 0 0.000000
1348++ 0.062500 0 0.000000
1349++ 0.125000 0 0.000000
1350++ 0.250000 0 0.000000
1351++ 0.500000 0 0.000000
1352++ 1.000000 0 0.000000
1353++ 2.000000 0 0.000000
1354++ 4.000000 0 0.000000
1355++ 8.000000 0 0.000000
1356++ 16.000000 0 0.000000
1357++ 32.000000 0 0.000000
1358++ 64.000000 0 0.000000
1359++ 128.000000 0 0.000000
1360++ 256.000000 0 0.000000
1361++ 512.000000 0 0.000000
1362++ 1024.000000 0 0.000000
1363++ 2048.000000 0 0.000000
1364++ 4096.000000 0 0.000000
1365++ 8192.000000 0 0.000000
1366++ 16384.000000 0 0.000000
1367++ 32768.000000 0 0.000000
1368++ 65536.000000 0 0.000000
1369++ 131072.000000 0 0.000000
1370++ 262144.000000 0 0.000000
1371++ 524288.000000 0 0.000000
1372++ 1048576.00000 0 0.000000
1373++ 2097152.00000 0 0.000000
1374++ 4194304.00000 0 0.000000
1375++ 8388608.00000 0 0.000000
1376++TOO LONG 0 TOO LONG
1377++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1378++time count total
1379++ 0.000001 0 0.000000
1380++ 0.000003 0 0.000000
1381++ 0.000007 0 0.000000
1382++ 0.000015 0 0.000000
1383++ 0.000030 0 0.000000
1384++ 0.000061 0 0.000000
1385++ 0.000122 0 0.000000
1386++ 0.000244 0 0.000000
1387++ 0.000488 0 0.000000
1388++ 0.000976 0 0.000000
1389++ 0.001953 0 0.000000
1390++ 0.003906 0 0.000000
1391++ 0.007812 0 0.000000
1392++ 0.015625 0 0.000000
1393++ 0.031250 0 0.000000
1394++ 0.062500 0 0.000000
1395++ 0.125000 0 0.000000
1396++ 0.250000 0 0.000000
1397++ 0.500000 0 0.000000
1398++ 1.000000 0 0.000000
1399++ 2.000000 0 0.000000
1400++ 4.000000 0 0.000000
1401++ 8.000000 0 0.000000
1402++ 16.000000 0 0.000000
1403++ 32.000000 0 0.000000
1404++ 64.000000 0 0.000000
1405++ 128.000000 0 0.000000
1406++ 256.000000 0 0.000000
1407++ 512.000000 0 0.000000
1408++ 1024.000000 0 0.000000
1409++ 2048.000000 0 0.000000
1410++ 4096.000000 0 0.000000
1411++ 8192.000000 0 0.000000
1412++ 16384.000000 0 0.000000
1413++ 32768.000000 0 0.000000
1414++ 65536.000000 0 0.000000
1415++ 131072.000000 0 0.000000
1416++ 262144.000000 0 0.000000
1417++ 524288.000000 0 0.000000
1418++ 1048576.00000 0 0.000000
1419++ 2097152.00000 0 0.000000
1420++ 4194304.00000 0 0.000000
1421++ 8388608.00000 0 0.000000
1422++TOO LONG 0 TOO LONG
1423 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1424 +CALL test_f(0.31);
1425 +CALL test_f(0.32);
1426@@ -2094,7 +2892,7 @@
1427 +query_response_time_range_base 2
1428 +SHOW QUERY_RESPONSE_TIME;
1429 +
1430-+ 0.000001 46 0.000000
1431++ 0.000001 45 0.000000
1432 + 0.000003 0 0.000000
1433 + 0.000007 0 0.000000
1434 + 0.000015 0 0.000000
1435@@ -2110,7 +2908,7 @@
1436 + 0.015625 0 0.000000
1437 + 0.031250 0 0.000000
1438 + 0.062500 0 0.000000
1439-+ 0.125000 46 4.600000
1440++ 0.125000 44 4.400000
1441 + 0.250000 0 0.000000
1442 + 0.500000 10 3.550000
1443 + 1.000000 1 0.500000
1444@@ -2140,7 +2938,7 @@
1445 +TOO LONG 0 TOO LONG
1446 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1447 +time count total
1448-+ 0.000001 46 0.000000
1449++ 0.000001 45 0.000000
1450 + 0.000003 0 0.000000
1451 + 0.000007 0 0.000000
1452 + 0.000015 0 0.000000
1453@@ -2156,7 +2954,7 @@
1454 + 0.015625 0 0.000000
1455 + 0.031250 0 0.000000
1456 + 0.062500 0 0.000000
1457-+ 0.125000 47 4.700000
1458++ 0.125000 44 4.400000
1459 + 0.250000 0 0.000000
1460 + 0.500000 10 3.550000
1461 + 1.000000 1 0.500000
1462@@ -2189,6 +2987,38 @@
1463 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1464 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
1465 +FLUSH QUERY_RESPONSE_TIME;
1466++SHOW QUERY_RESPONSE_TIME;
1467++
1468++ 0.000001 0 0.000000
1469++ 0.000010 0 0.000000
1470++ 0.000100 0 0.000000
1471++ 0.001000 0 0.000000
1472++ 0.010000 0 0.000000
1473++ 0.100000 0 0.000000
1474++ 1.000000 0 0.000000
1475++ 10.000000 0 0.000000
1476++ 100.000000 0 0.000000
1477++ 1000.000000 0 0.000000
1478++ 10000.000000 0 0.000000
1479++ 100000.000000 0 0.000000
1480++ 1000000.00000 0 0.000000
1481++TOO LONG 0 TOO LONG
1482++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1483++time count total
1484++ 0.000001 0 0.000000
1485++ 0.000010 0 0.000000
1486++ 0.000100 0 0.000000
1487++ 0.001000 0 0.000000
1488++ 0.010000 0 0.000000
1489++ 0.100000 0 0.000000
1490++ 1.000000 0 0.000000
1491++ 10.000000 0 0.000000
1492++ 100.000000 0 0.000000
1493++ 1000.000000 0 0.000000
1494++ 10000.000000 0 0.000000
1495++ 100000.000000 0 0.000000
1496++ 1000000.00000 0 0.000000
1497++TOO LONG 0 TOO LONG
1498 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1499 +CALL test_f(0.31);
1500 +CALL test_f(0.32);
1501@@ -2218,13 +3048,13 @@
1502 +query_response_time_range_base 10
1503 +SHOW QUERY_RESPONSE_TIME;
1504 +
1505-+ 0.000001 46 0.000000
1506++ 0.000001 45 0.000000
1507 + 0.000010 0 0.000000
1508 + 0.000100 0 0.000000
1509 + 0.001000 0 0.000000
1510 + 0.010000 0 0.000000
1511 + 0.100000 0 0.000000
1512-+ 1.000000 57 8.650000
1513++ 1.000000 55 8.450000
1514 + 10.000000 11 25.699999
1515 + 100.000000 0 0.000000
1516 + 1000.000000 0 0.000000
1517@@ -2234,13 +3064,13 @@
1518 +TOO LONG 0 TOO LONG
1519 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1520 +time count total
1521-+ 0.000001 46 0.000000
1522++ 0.000001 45 0.000000
1523 + 0.000010 0 0.000000
1524 + 0.000100 0 0.000000
1525 + 0.001000 0 0.000000
1526 + 0.010000 0 0.000000
1527 + 0.100000 0 0.000000
1528-+ 1.000000 58 8.750000
1529++ 1.000000 55 8.450000
1530 + 10.000000 11 25.699999
1531 + 100.000000 0 0.000000
1532 + 1000.000000 0 0.000000
1533@@ -2253,6 +3083,44 @@
1534 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1535 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
1536 +FLUSH QUERY_RESPONSE_TIME;
1537++SHOW QUERY_RESPONSE_TIME;
1538++
1539++ 0.000001 0 0.000000
1540++ 0.000008 0 0.000000
1541++ 0.000059 0 0.000000
1542++ 0.000416 0 0.000000
1543++ 0.002915 0 0.000000
1544++ 0.020408 0 0.000000
1545++ 0.142857 0 0.000000
1546++ 1.000000 0 0.000000
1547++ 7.000000 0 0.000000
1548++ 49.000000 0 0.000000
1549++ 343.000000 0 0.000000
1550++ 2401.000000 0 0.000000
1551++ 16807.000000 0 0.000000
1552++ 117649.000000 0 0.000000
1553++ 823543.000000 0 0.000000
1554++ 5764801.00000 0 0.000000
1555++TOO LONG 0 TOO LONG
1556++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1557++time count total
1558++ 0.000001 0 0.000000
1559++ 0.000008 0 0.000000
1560++ 0.000059 0 0.000000
1561++ 0.000416 0 0.000000
1562++ 0.002915 0 0.000000
1563++ 0.020408 0 0.000000
1564++ 0.142857 0 0.000000
1565++ 1.000000 0 0.000000
1566++ 7.000000 0 0.000000
1567++ 49.000000 0 0.000000
1568++ 343.000000 0 0.000000
1569++ 2401.000000 0 0.000000
1570++ 16807.000000 0 0.000000
1571++ 117649.000000 0 0.000000
1572++ 823543.000000 0 0.000000
1573++ 5764801.00000 0 0.000000
1574++TOO LONG 0 TOO LONG
1575 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1576 +CALL test_f(0.31);
1577 +CALL test_f(0.32);
1578@@ -2282,13 +3150,13 @@
1579 +query_response_time_range_base 7
1580 +SHOW QUERY_RESPONSE_TIME;
1581 +
1582-+ 0.000001 46 0.000000
1583++ 0.000001 45 0.000000
1584 + 0.000008 0 0.000000
1585 + 0.000059 0 0.000000
1586 + 0.000416 0 0.000000
1587 + 0.002915 0 0.000000
1588 + 0.020408 0 0.000000
1589-+ 0.142857 46 4.600000
1590++ 0.142857 44 4.400000
1591 + 1.000000 11 4.050000
1592 + 7.000000 11 25.699999
1593 + 49.000000 0 0.000000
1594@@ -2301,13 +3169,13 @@
1595 +TOO LONG 0 TOO LONG
1596 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1597 +time count total
1598-+ 0.000001 46 0.000000
1599++ 0.000001 45 0.000000
1600 + 0.000008 0 0.000000
1601 + 0.000059 0 0.000000
1602 + 0.000416 0 0.000000
1603 + 0.002915 0 0.000000
1604 + 0.020408 0 0.000000
1605-+ 0.142857 47 4.700000
1606++ 0.142857 44 4.400000
1607 + 1.000000 11 4.050000
1608 + 7.000000 11 25.699999
1609 + 49.000000 0 0.000000
1610@@ -2323,6 +3191,24 @@
1611 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1612 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
1613 +FLUSH QUERY_RESPONSE_TIME;
1614++SHOW QUERY_RESPONSE_TIME;
1615++
1616++ 0.000041 0 0.000000
1617++ 0.006410 0 0.000000
1618++ 1.000000 0 0.000000
1619++ 156.000000 0 0.000000
1620++ 24336.000000 0 0.000000
1621++ 3796416.00000 0 0.000000
1622++TOO LONG 0 TOO LONG
1623++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1624++time count total
1625++ 0.000041 0 0.000000
1626++ 0.006410 0 0.000000
1627++ 1.000000 0 0.000000
1628++ 156.000000 0 0.000000
1629++ 24336.000000 0 0.000000
1630++ 3796416.00000 0 0.000000
1631++TOO LONG 0 TOO LONG
1632 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1633 +CALL test_f(0.31);
1634 +CALL test_f(0.32);
1635@@ -2352,18 +3238,18 @@
1636 +query_response_time_range_base 156
1637 +SHOW QUERY_RESPONSE_TIME;
1638 +
1639-+ 0.000041 46 0.000000
1640++ 0.000041 45 0.000000
1641 + 0.006410 0 0.000000
1642-+ 1.000000 57 8.650000
1643++ 1.000000 55 8.450000
1644 + 156.000000 11 25.699999
1645 + 24336.000000 0 0.000000
1646 + 3796416.00000 0 0.000000
1647 +TOO LONG 0 TOO LONG
1648 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1649 +time count total
1650-+ 0.000041 46 0.000000
1651++ 0.000041 45 0.000000
1652 + 0.006410 0 0.000000
1653-+ 1.000000 58 8.750000
1654++ 1.000000 55 8.450000
1655 + 156.000000 11 25.699999
1656 + 24336.000000 0 0.000000
1657 + 3796416.00000 0 0.000000
1658@@ -2373,6 +3259,22 @@
1659 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
1660 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
1661 +FLUSH QUERY_RESPONSE_TIME;
1662++SHOW QUERY_RESPONSE_TIME;
1663++
1664++ 0.000001 0 0.000000
1665++ 0.001000 0 0.000000
1666++ 1.000000 0 0.000000
1667++ 1000.000000 0 0.000000
1668++ 1000000.00000 0 0.000000
1669++TOO LONG 0 TOO LONG
1670++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1671++time count total
1672++ 0.000001 0 0.000000
1673++ 0.001000 0 0.000000
1674++ 1.000000 0 0.000000
1675++ 1000.000000 0 0.000000
1676++ 1000000.00000 0 0.000000
1677++TOO LONG 0 TOO LONG
1678 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1679 +CALL test_f(0.31);
1680 +CALL test_f(0.32);
1681@@ -2402,17 +3304,17 @@
1682 +query_response_time_range_base 1000
1683 +SHOW QUERY_RESPONSE_TIME;
1684 +
1685-+ 0.000001 46 0.000000
1686++ 0.000001 45 0.000000
1687 + 0.001000 0 0.000000
1688-+ 1.000000 57 8.650000
1689++ 1.000000 55 8.450000
1690 + 1000.000000 11 25.699999
1691 + 1000000.00000 0 0.000000
1692 +TOO LONG 0 TOO LONG
1693 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1694 +time count total
1695-+ 0.000001 46 0.000000
1696++ 0.000001 45 0.000000
1697 + 0.001000 0 0.000000
1698-+ 1.000000 58 8.750000
1699++ 1.000000 55 8.450000
1700 + 1000.000000 11 25.699999
1701 + 1000000.00000 0 0.000000
1702 +TOO LONG 0 TOO LONG
1703@@ -2423,6 +3325,22 @@
1704 +Warnings:
1705 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1001'
1706 +FLUSH QUERY_RESPONSE_TIME;
1707++SHOW QUERY_RESPONSE_TIME;
1708++
1709++ 0.000001 0 0.000000
1710++ 0.001000 0 0.000000
1711++ 1.000000 0 0.000000
1712++ 1000.000000 0 0.000000
1713++ 1000000.00000 0 0.000000
1714++TOO LONG 0 TOO LONG
1715++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1716++time count total
1717++ 0.000001 0 0.000000
1718++ 0.001000 0 0.000000
1719++ 1.000000 0 0.000000
1720++ 1000.000000 0 0.000000
1721++ 1000000.00000 0 0.000000
1722++TOO LONG 0 TOO LONG
1723 +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
1724 +CALL test_f(0.31);
1725 +CALL test_f(0.32);
1726@@ -2452,17 +3370,17 @@
1727 +query_response_time_range_base 1000
1728 +SHOW QUERY_RESPONSE_TIME;
1729 +
1730-+ 0.000001 46 0.000000
1731++ 0.000001 45 0.000000
1732 + 0.001000 0 0.000000
1733-+ 1.000000 57 8.650000
1734++ 1.000000 55 8.450000
1735 + 1000.000000 11 25.699999
1736 + 1000000.00000 0 0.000000
1737 +TOO LONG 0 TOO LONG
1738 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
1739 +time count total
1740-+ 0.000001 46 0.000000
1741++ 0.000001 45 0.000000
1742 + 0.001000 0 0.000000
1743-+ 1.000000 58 8.750000
1744++ 1.000000 55 8.450000
1745 + 1000.000000 11 25.699999
1746 + 1000000.00000 0 0.000000
1747 +TOO LONG 0 TOO LONG
1748@@ -3099,17 +4017,24 @@
1749 #include "transaction.h"
1750 #include "sql_audit.h"
1751 #include "sql_prepare.h"
1752-@@ -1507,6 +1508,9 @@
1753+@@ -1507,6 +1508,12 @@
1754
1755 ulonglong end_utime_of_query= thd->current_utime();
1756 ulonglong query_exec_time= get_query_exec_time(thd, end_utime_of_query);
1757 +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
1758-+ query_response_time_collect(query_exec_time);
1759++ if (opt_query_response_time_stats)
1760++ {
1761++ query_response_time_collect(query_exec_time);
1762++ }
1763 +#endif
1764
1765 /*
1766 Low long_query_time value most likely means user is debugging stuff and even
1767+<<<<<<< TREE
1768 @@ -1671,6 +1675,7 @@
1769+=======
1770+@@ -1671,6 +1678,7 @@
1771+>>>>>>> MERGE-SOURCE
1772 case SCH_CHARSETS:
1773 case SCH_ENGINES:
1774 case SCH_COLLATIONS:

Subscribers

People subscribed via source and target branches