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

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

  1. 5.1_fix_bug_855312
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Merged
Approved by: Oleg Tsarev
Approved revision: no longer in the source branch.
Merged at revision: 298
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_855312
Merge into: lp:percona-server/5.1
Diff against target: 1024 lines (+401/-90)
1 file modified
patches/response_time_distribution.patch (+401/-90)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_855312
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+76675@code.launchpad.net

This proposal supersedes a proposal from 2011-09-21.

Description of the change

Fix bug #855312: QUERY_RESPONSE_TIME doesn't respect ENABLE_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 : Posted in a previous version of this proposal

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/142/

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

The code part LGTM.
In tests:
1) I think it is enough to test for not collecting data when the option is off only in the query_response_time.inc, no need to do it in query_response_time-replication.inc and uery_response_time-stored.inc.
2) In query_response_time.inc add a comment before ++SHOW QUERY_RESPONSE_TIME; (line 15):
# Test for LP bug #855312 - slow query data was collected when opt_query_response_time_stats was off
or similar.

LGTM with these two changes.

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

Laurynas: done
http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/143/
Jenkins results are clear

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM

review: Approve

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 09:03:52 +0000
3+++ patches/response_time_distribution.patch 2011-09-23 06:55:36 +0000
4@@ -29,12 +29,16 @@
5 +have_response_time_distribution YES
6 --- /dev/null
7 +++ b/mysql-test/include/query_response_time.inc
8-@@ -0,0 +1,39 @@
9+@@ -0,0 +1,43 @@
10 +SET SESSION query_exec_time=0.1;
11 +
12 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
13 +EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
14++# Following two queries check works of FLUSH and
15++# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
16 +FLUSH QUERY_RESPONSE_TIME;
17++SHOW QUERY_RESPONSE_TIME;
18++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
19 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
20 +
21 +SET SESSION query_exec_time=0.31; SELECT 1;
22@@ -236,7 +240,7 @@
23 +query_response_time_range_base 2
24 +SHOW QUERY_RESPONSE_TIME;
25 +
26-+ 0.000001 2 0.000000
27++ 0.000001 1 0.000000
28 + 0.000003 0 0.000000
29 + 0.000007 0 0.000000
30 + 0.000015 0 0.000000
31@@ -252,7 +256,7 @@
32 + 0.015625 0 0.000000
33 + 0.031250 0 0.000000
34 + 0.062500 0 0.000000
35-+ 0.125000 3 0.300000
36++ 0.125000 1 0.100000
37 + 0.250000 0 0.000000
38 + 0.500000 10 3.550000
39 + 1.000000 1 0.500000
40@@ -282,7 +286,7 @@
41 +TOO LONG 0 TOO LONG
42 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
43 +time count total
44-+ 0.000001 2 0.000000
45++ 0.000001 1 0.000000
46 + 0.000003 0 0.000000
47 + 0.000007 0 0.000000
48 + 0.000015 0 0.000000
49@@ -298,7 +302,7 @@
50 + 0.015625 0 0.000000
51 + 0.031250 0 0.000000
52 + 0.062500 0 0.000000
53-+ 0.125000 4 0.400000
54++ 0.125000 1 0.100000
55 + 0.250000 0 0.000000
56 + 0.500000 10 3.550000
57 + 1.000000 1 0.500000
58@@ -387,7 +391,7 @@
59 +query_response_time_range_base 2
60 +SHOW QUERY_RESPONSE_TIME;
61 +
62-+ 0.000001 2 0.000000
63++ 0.000001 1 0.000000
64 + 0.000003 0 0.000000
65 + 0.000007 0 0.000000
66 + 0.000015 0 0.000000
67@@ -403,7 +407,7 @@
68 + 0.015625 0 0.000000
69 + 0.031250 0 0.000000
70 + 0.062500 0 0.000000
71-+ 0.125000 3 0.300000
72++ 0.125000 1 0.100000
73 + 0.250000 0 0.000000
74 + 0.500000 10 3.550000
75 + 1.000000 1 0.500000
76@@ -433,7 +437,7 @@
77 +TOO LONG 0 TOO LONG
78 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
79 +time count total
80-+ 0.000001 2 0.000000
81++ 0.000001 1 0.000000
82 + 0.000003 0 0.000000
83 + 0.000007 0 0.000000
84 + 0.000015 0 0.000000
85@@ -449,7 +453,7 @@
86 + 0.015625 0 0.000000
87 + 0.031250 0 0.000000
88 + 0.062500 0 0.000000
89-+ 0.125000 4 0.400000
90++ 0.125000 1 0.100000
91 + 0.250000 0 0.000000
92 + 0.500000 10 3.550000
93 + 1.000000 1 0.500000
94@@ -538,13 +542,13 @@
95 +query_response_time_range_base 10
96 +SHOW QUERY_RESPONSE_TIME;
97 +
98-+ 0.000001 2 0.000000
99++ 0.000001 1 0.000000
100 + 0.000010 0 0.000000
101 + 0.000100 0 0.000000
102 + 0.001000 0 0.000000
103 + 0.010000 0 0.000000
104 + 0.100000 0 0.000000
105-+ 1.000000 14 4.350000
106++ 1.000000 12 4.150000
107 + 10.000000 11 25.700000
108 + 100.000000 0 0.000000
109 + 1000.000000 0 0.000000
110@@ -554,13 +558,13 @@
111 +TOO LONG 0 TOO LONG
112 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
113 +time count total
114-+ 0.000001 2 0.000000
115++ 0.000001 1 0.000000
116 + 0.000010 0 0.000000
117 + 0.000100 0 0.000000
118 + 0.001000 0 0.000000
119 + 0.010000 0 0.000000
120 + 0.100000 0 0.000000
121-+ 1.000000 15 4.450000
122++ 1.000000 12 4.150000
123 + 10.000000 11 25.700000
124 + 100.000000 0 0.000000
125 + 1000.000000 0 0.000000
126@@ -629,13 +633,13 @@
127 +query_response_time_range_base 7
128 +SHOW QUERY_RESPONSE_TIME;
129 +
130-+ 0.000001 2 0.000000
131++ 0.000001 1 0.000000
132 + 0.000008 0 0.000000
133 + 0.000059 0 0.000000
134 + 0.000416 0 0.000000
135 + 0.002915 0 0.000000
136 + 0.020408 0 0.000000
137-+ 0.142857 3 0.300000
138++ 0.142857 1 0.100000
139 + 1.000000 11 4.050000
140 + 7.000000 11 25.700000
141 + 49.000000 0 0.000000
142@@ -648,13 +652,13 @@
143 +TOO LONG 0 TOO LONG
144 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
145 +time count total
146-+ 0.000001 2 0.000000
147++ 0.000001 1 0.000000
148 + 0.000008 0 0.000000
149 + 0.000059 0 0.000000
150 + 0.000416 0 0.000000
151 + 0.002915 0 0.000000
152 + 0.020408 0 0.000000
153-+ 0.142857 4 0.400000
154++ 0.142857 1 0.100000
155 + 1.000000 11 4.050000
156 + 7.000000 11 25.700000
157 + 49.000000 0 0.000000
158@@ -726,18 +730,18 @@
159 +query_response_time_range_base 156
160 +SHOW QUERY_RESPONSE_TIME;
161 +
162-+ 0.000041 2 0.000000
163++ 0.000041 1 0.000000
164 + 0.006410 0 0.000000
165-+ 1.000000 14 4.350000
166++ 1.000000 12 4.150000
167 + 156.000000 11 25.700000
168 + 24336.000000 0 0.000000
169 + 3796416.00000 0 0.000000
170 +TOO LONG 0 TOO LONG
171 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
172 +time count total
173-+ 0.000041 2 0.000000
174++ 0.000041 1 0.000000
175 + 0.006410 0 0.000000
176-+ 1.000000 15 4.450000
177++ 1.000000 12 4.150000
178 + 156.000000 11 25.700000
179 + 24336.000000 0 0.000000
180 + 3796416.00000 0 0.000000
181@@ -803,17 +807,17 @@
182 +query_response_time_range_base 1000
183 +SHOW QUERY_RESPONSE_TIME;
184 +
185-+ 0.000001 2 0.000000
186++ 0.000001 1 0.000000
187 + 0.001000 0 0.000000
188-+ 1.000000 14 4.350000
189++ 1.000000 12 4.150000
190 + 1000.000000 11 25.700000
191 + 1000000.00000 0 0.000000
192 +TOO LONG 0 TOO LONG
193 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
194 +time count total
195-+ 0.000001 2 0.000000
196++ 0.000001 1 0.000000
197 + 0.001000 0 0.000000
198-+ 1.000000 15 4.450000
199++ 1.000000 12 4.150000
200 + 1000.000000 11 25.700000
201 + 1000000.00000 0 0.000000
202 +TOO LONG 0 TOO LONG
203@@ -880,17 +884,17 @@
204 +query_response_time_range_base 1000
205 +SHOW QUERY_RESPONSE_TIME;
206 +
207-+ 0.000001 2 0.000000
208++ 0.000001 1 0.000000
209 + 0.001000 0 0.000000
210-+ 1.000000 14 4.350000
211++ 1.000000 12 4.150000
212 + 1000.000000 11 25.700000
213 + 1000000.00000 0 0.000000
214 +TOO LONG 0 TOO LONG
215 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
216 +time count total
217-+ 0.000001 2 0.000000
218++ 0.000001 1 0.000000
219 + 0.001000 0 0.000000
220-+ 1.000000 15 4.450000
221++ 1.000000 12 4.150000
222 + 1000.000000 11 25.700000
223 + 1000000.00000 0 0.000000
224 +TOO LONG 0 TOO LONG
225@@ -902,13 +906,105 @@
226 +SET GLOBAL query_exec_time=default;
227 --- /dev/null
228 +++ b/mysql-test/r/percona_query_response_time.result
229-@@ -0,0 +1,1003 @@
230+@@ -0,0 +1,1307 @@
231 +SET SESSION query_exec_time=0.1;
232 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
233 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1;
234 +Warnings:
235 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1'
236 +FLUSH QUERY_RESPONSE_TIME;
237++SHOW QUERY_RESPONSE_TIME;
238++
239++ 0.000001 0 0.000000
240++ 0.000003 0 0.000000
241++ 0.000007 0 0.000000
242++ 0.000015 0 0.000000
243++ 0.000030 0 0.000000
244++ 0.000061 0 0.000000
245++ 0.000122 0 0.000000
246++ 0.000244 0 0.000000
247++ 0.000488 0 0.000000
248++ 0.000976 0 0.000000
249++ 0.001953 0 0.000000
250++ 0.003906 0 0.000000
251++ 0.007812 0 0.000000
252++ 0.015625 0 0.000000
253++ 0.031250 0 0.000000
254++ 0.062500 0 0.000000
255++ 0.125000 0 0.000000
256++ 0.250000 0 0.000000
257++ 0.500000 0 0.000000
258++ 1.000000 0 0.000000
259++ 2.000000 0 0.000000
260++ 4.000000 0 0.000000
261++ 8.000000 0 0.000000
262++ 16.000000 0 0.000000
263++ 32.000000 0 0.000000
264++ 64.000000 0 0.000000
265++ 128.000000 0 0.000000
266++ 256.000000 0 0.000000
267++ 512.000000 0 0.000000
268++ 1024.000000 0 0.000000
269++ 2048.000000 0 0.000000
270++ 4096.000000 0 0.000000
271++ 8192.000000 0 0.000000
272++ 16384.000000 0 0.000000
273++ 32768.000000 0 0.000000
274++ 65536.000000 0 0.000000
275++ 131072.000000 0 0.000000
276++ 262144.000000 0 0.000000
277++ 524288.000000 0 0.000000
278++ 1048576.00000 0 0.000000
279++ 2097152.00000 0 0.000000
280++ 4194304.00000 0 0.000000
281++ 8388608.00000 0 0.000000
282++TOO LONG 0 TOO LONG
283++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
284++time count total
285++ 0.000001 0 0.000000
286++ 0.000003 0 0.000000
287++ 0.000007 0 0.000000
288++ 0.000015 0 0.000000
289++ 0.000030 0 0.000000
290++ 0.000061 0 0.000000
291++ 0.000122 0 0.000000
292++ 0.000244 0 0.000000
293++ 0.000488 0 0.000000
294++ 0.000976 0 0.000000
295++ 0.001953 0 0.000000
296++ 0.003906 0 0.000000
297++ 0.007812 0 0.000000
298++ 0.015625 0 0.000000
299++ 0.031250 0 0.000000
300++ 0.062500 0 0.000000
301++ 0.125000 0 0.000000
302++ 0.250000 0 0.000000
303++ 0.500000 0 0.000000
304++ 1.000000 0 0.000000
305++ 2.000000 0 0.000000
306++ 4.000000 0 0.000000
307++ 8.000000 0 0.000000
308++ 16.000000 0 0.000000
309++ 32.000000 0 0.000000
310++ 64.000000 0 0.000000
311++ 128.000000 0 0.000000
312++ 256.000000 0 0.000000
313++ 512.000000 0 0.000000
314++ 1024.000000 0 0.000000
315++ 2048.000000 0 0.000000
316++ 4096.000000 0 0.000000
317++ 8192.000000 0 0.000000
318++ 16384.000000 0 0.000000
319++ 32768.000000 0 0.000000
320++ 65536.000000 0 0.000000
321++ 131072.000000 0 0.000000
322++ 262144.000000 0 0.000000
323++ 524288.000000 0 0.000000
324++ 1048576.00000 0 0.000000
325++ 2097152.00000 0 0.000000
326++ 4194304.00000 0 0.000000
327++ 8388608.00000 0 0.000000
328++TOO LONG 0 TOO LONG
329 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
330 +SET SESSION query_exec_time=0.31;
331 +SELECT 1;
332@@ -1005,7 +1101,7 @@
333 +query_response_time_range_base 2
334 +SHOW QUERY_RESPONSE_TIME;
335 +
336-+ 0.000001 25 0.000000
337++ 0.000001 24 0.000000
338 + 0.000003 0 0.000000
339 + 0.000007 0 0.000000
340 + 0.000015 0 0.000000
341@@ -1021,7 +1117,7 @@
342 + 0.015625 0 0.000000
343 + 0.031250 0 0.000000
344 + 0.062500 0 0.000000
345-+ 0.125000 2 0.200000
346++ 0.125000 0 0.000000
347 + 0.250000 0 0.000000
348 + 0.500000 10 3.550000
349 + 1.000000 1 0.500000
350@@ -1051,7 +1147,7 @@
351 +TOO LONG 0 TOO LONG
352 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
353 +time count total
354-+ 0.000001 25 0.000000
355++ 0.000001 24 0.000000
356 + 0.000003 0 0.000000
357 + 0.000007 0 0.000000
358 + 0.000015 0 0.000000
359@@ -1067,7 +1163,7 @@
360 + 0.015625 0 0.000000
361 + 0.031250 0 0.000000
362 + 0.062500 0 0.000000
363-+ 0.125000 3 0.300000
364++ 0.125000 0 0.000000
365 + 0.250000 0 0.000000
366 + 0.500000 10 3.550000
367 + 1.000000 1 0.500000
368@@ -1100,6 +1196,98 @@
369 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
370 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
371 +FLUSH QUERY_RESPONSE_TIME;
372++SHOW QUERY_RESPONSE_TIME;
373++
374++ 0.000001 0 0.000000
375++ 0.000003 0 0.000000
376++ 0.000007 0 0.000000
377++ 0.000015 0 0.000000
378++ 0.000030 0 0.000000
379++ 0.000061 0 0.000000
380++ 0.000122 0 0.000000
381++ 0.000244 0 0.000000
382++ 0.000488 0 0.000000
383++ 0.000976 0 0.000000
384++ 0.001953 0 0.000000
385++ 0.003906 0 0.000000
386++ 0.007812 0 0.000000
387++ 0.015625 0 0.000000
388++ 0.031250 0 0.000000
389++ 0.062500 0 0.000000
390++ 0.125000 0 0.000000
391++ 0.250000 0 0.000000
392++ 0.500000 0 0.000000
393++ 1.000000 0 0.000000
394++ 2.000000 0 0.000000
395++ 4.000000 0 0.000000
396++ 8.000000 0 0.000000
397++ 16.000000 0 0.000000
398++ 32.000000 0 0.000000
399++ 64.000000 0 0.000000
400++ 128.000000 0 0.000000
401++ 256.000000 0 0.000000
402++ 512.000000 0 0.000000
403++ 1024.000000 0 0.000000
404++ 2048.000000 0 0.000000
405++ 4096.000000 0 0.000000
406++ 8192.000000 0 0.000000
407++ 16384.000000 0 0.000000
408++ 32768.000000 0 0.000000
409++ 65536.000000 0 0.000000
410++ 131072.000000 0 0.000000
411++ 262144.000000 0 0.000000
412++ 524288.000000 0 0.000000
413++ 1048576.00000 0 0.000000
414++ 2097152.00000 0 0.000000
415++ 4194304.00000 0 0.000000
416++ 8388608.00000 0 0.000000
417++TOO LONG 0 TOO LONG
418++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
419++time count total
420++ 0.000001 0 0.000000
421++ 0.000003 0 0.000000
422++ 0.000007 0 0.000000
423++ 0.000015 0 0.000000
424++ 0.000030 0 0.000000
425++ 0.000061 0 0.000000
426++ 0.000122 0 0.000000
427++ 0.000244 0 0.000000
428++ 0.000488 0 0.000000
429++ 0.000976 0 0.000000
430++ 0.001953 0 0.000000
431++ 0.003906 0 0.000000
432++ 0.007812 0 0.000000
433++ 0.015625 0 0.000000
434++ 0.031250 0 0.000000
435++ 0.062500 0 0.000000
436++ 0.125000 0 0.000000
437++ 0.250000 0 0.000000
438++ 0.500000 0 0.000000
439++ 1.000000 0 0.000000
440++ 2.000000 0 0.000000
441++ 4.000000 0 0.000000
442++ 8.000000 0 0.000000
443++ 16.000000 0 0.000000
444++ 32.000000 0 0.000000
445++ 64.000000 0 0.000000
446++ 128.000000 0 0.000000
447++ 256.000000 0 0.000000
448++ 512.000000 0 0.000000
449++ 1024.000000 0 0.000000
450++ 2048.000000 0 0.000000
451++ 4096.000000 0 0.000000
452++ 8192.000000 0 0.000000
453++ 16384.000000 0 0.000000
454++ 32768.000000 0 0.000000
455++ 65536.000000 0 0.000000
456++ 131072.000000 0 0.000000
457++ 262144.000000 0 0.000000
458++ 524288.000000 0 0.000000
459++ 1048576.00000 0 0.000000
460++ 2097152.00000 0 0.000000
461++ 4194304.00000 0 0.000000
462++ 8388608.00000 0 0.000000
463++TOO LONG 0 TOO LONG
464 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
465 +SET SESSION query_exec_time=0.31;
466 +SELECT 1;
467@@ -1196,7 +1384,7 @@
468 +query_response_time_range_base 2
469 +SHOW QUERY_RESPONSE_TIME;
470 +
471-+ 0.000001 25 0.000000
472++ 0.000001 24 0.000000
473 + 0.000003 0 0.000000
474 + 0.000007 0 0.000000
475 + 0.000015 0 0.000000
476@@ -1212,7 +1400,7 @@
477 + 0.015625 0 0.000000
478 + 0.031250 0 0.000000
479 + 0.062500 0 0.000000
480-+ 0.125000 2 0.200000
481++ 0.125000 0 0.000000
482 + 0.250000 0 0.000000
483 + 0.500000 10 3.550000
484 + 1.000000 1 0.500000
485@@ -1242,7 +1430,7 @@
486 +TOO LONG 0 TOO LONG
487 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
488 +time count total
489-+ 0.000001 25 0.000000
490++ 0.000001 24 0.000000
491 + 0.000003 0 0.000000
492 + 0.000007 0 0.000000
493 + 0.000015 0 0.000000
494@@ -1258,7 +1446,7 @@
495 + 0.015625 0 0.000000
496 + 0.031250 0 0.000000
497 + 0.062500 0 0.000000
498-+ 0.125000 3 0.300000
499++ 0.125000 0 0.000000
500 + 0.250000 0 0.000000
501 + 0.500000 10 3.550000
502 + 1.000000 1 0.500000
503@@ -1291,6 +1479,38 @@
504 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
505 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
506 +FLUSH QUERY_RESPONSE_TIME;
507++SHOW QUERY_RESPONSE_TIME;
508++
509++ 0.000001 0 0.000000
510++ 0.000010 0 0.000000
511++ 0.000100 0 0.000000
512++ 0.001000 0 0.000000
513++ 0.010000 0 0.000000
514++ 0.100000 0 0.000000
515++ 1.000000 0 0.000000
516++ 10.000000 0 0.000000
517++ 100.000000 0 0.000000
518++ 1000.000000 0 0.000000
519++ 10000.000000 0 0.000000
520++ 100000.000000 0 0.000000
521++ 1000000.00000 0 0.000000
522++TOO LONG 0 TOO LONG
523++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
524++time count total
525++ 0.000001 0 0.000000
526++ 0.000010 0 0.000000
527++ 0.000100 0 0.000000
528++ 0.001000 0 0.000000
529++ 0.010000 0 0.000000
530++ 0.100000 0 0.000000
531++ 1.000000 0 0.000000
532++ 10.000000 0 0.000000
533++ 100.000000 0 0.000000
534++ 1000.000000 0 0.000000
535++ 10000.000000 0 0.000000
536++ 100000.000000 0 0.000000
537++ 1000000.00000 0 0.000000
538++TOO LONG 0 TOO LONG
539 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
540 +SET SESSION query_exec_time=0.31;
541 +SELECT 1;
542@@ -1387,13 +1607,13 @@
543 +query_response_time_range_base 10
544 +SHOW QUERY_RESPONSE_TIME;
545 +
546-+ 0.000001 25 0.000000
547++ 0.000001 24 0.000000
548 + 0.000010 0 0.000000
549 + 0.000100 0 0.000000
550 + 0.001000 0 0.000000
551 + 0.010000 0 0.000000
552 + 0.100000 0 0.000000
553-+ 1.000000 13 4.250000
554++ 1.000000 11 4.050000
555 + 10.000000 11 25.700000
556 + 100.000000 0 0.000000
557 + 1000.000000 0 0.000000
558@@ -1403,13 +1623,13 @@
559 +TOO LONG 0 TOO LONG
560 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
561 +time count total
562-+ 0.000001 25 0.000000
563++ 0.000001 24 0.000000
564 + 0.000010 0 0.000000
565 + 0.000100 0 0.000000
566 + 0.001000 0 0.000000
567 + 0.010000 0 0.000000
568 + 0.100000 0 0.000000
569-+ 1.000000 14 4.350000
570++ 1.000000 11 4.050000
571 + 10.000000 11 25.700000
572 + 100.000000 0 0.000000
573 + 1000.000000 0 0.000000
574@@ -1422,6 +1642,44 @@
575 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
576 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
577 +FLUSH QUERY_RESPONSE_TIME;
578++SHOW QUERY_RESPONSE_TIME;
579++
580++ 0.000001 0 0.000000
581++ 0.000008 0 0.000000
582++ 0.000059 0 0.000000
583++ 0.000416 0 0.000000
584++ 0.002915 0 0.000000
585++ 0.020408 0 0.000000
586++ 0.142857 0 0.000000
587++ 1.000000 0 0.000000
588++ 7.000000 0 0.000000
589++ 49.000000 0 0.000000
590++ 343.000000 0 0.000000
591++ 2401.000000 0 0.000000
592++ 16807.000000 0 0.000000
593++ 117649.000000 0 0.000000
594++ 823543.000000 0 0.000000
595++ 5764801.00000 0 0.000000
596++TOO LONG 0 TOO LONG
597++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
598++time count total
599++ 0.000001 0 0.000000
600++ 0.000008 0 0.000000
601++ 0.000059 0 0.000000
602++ 0.000416 0 0.000000
603++ 0.002915 0 0.000000
604++ 0.020408 0 0.000000
605++ 0.142857 0 0.000000
606++ 1.000000 0 0.000000
607++ 7.000000 0 0.000000
608++ 49.000000 0 0.000000
609++ 343.000000 0 0.000000
610++ 2401.000000 0 0.000000
611++ 16807.000000 0 0.000000
612++ 117649.000000 0 0.000000
613++ 823543.000000 0 0.000000
614++ 5764801.00000 0 0.000000
615++TOO LONG 0 TOO LONG
616 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
617 +SET SESSION query_exec_time=0.31;
618 +SELECT 1;
619@@ -1518,13 +1776,13 @@
620 +query_response_time_range_base 7
621 +SHOW QUERY_RESPONSE_TIME;
622 +
623-+ 0.000001 25 0.000000
624++ 0.000001 24 0.000000
625 + 0.000008 0 0.000000
626 + 0.000059 0 0.000000
627 + 0.000416 0 0.000000
628 + 0.002915 0 0.000000
629 + 0.020408 0 0.000000
630-+ 0.142857 2 0.200000
631++ 0.142857 0 0.000000
632 + 1.000000 11 4.050000
633 + 7.000000 11 25.700000
634 + 49.000000 0 0.000000
635@@ -1537,13 +1795,13 @@
636 +TOO LONG 0 TOO LONG
637 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
638 +time count total
639-+ 0.000001 25 0.000000
640++ 0.000001 24 0.000000
641 + 0.000008 0 0.000000
642 + 0.000059 0 0.000000
643 + 0.000416 0 0.000000
644 + 0.002915 0 0.000000
645 + 0.020408 0 0.000000
646-+ 0.142857 3 0.300000
647++ 0.142857 0 0.000000
648 + 1.000000 11 4.050000
649 + 7.000000 11 25.700000
650 + 49.000000 0 0.000000
651@@ -1559,6 +1817,24 @@
652 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
653 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
654 +FLUSH QUERY_RESPONSE_TIME;
655++SHOW QUERY_RESPONSE_TIME;
656++
657++ 0.000041 0 0.000000
658++ 0.006410 0 0.000000
659++ 1.000000 0 0.000000
660++ 156.000000 0 0.000000
661++ 24336.000000 0 0.000000
662++ 3796416.00000 0 0.000000
663++TOO LONG 0 TOO LONG
664++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
665++time count total
666++ 0.000041 0 0.000000
667++ 0.006410 0 0.000000
668++ 1.000000 0 0.000000
669++ 156.000000 0 0.000000
670++ 24336.000000 0 0.000000
671++ 3796416.00000 0 0.000000
672++TOO LONG 0 TOO LONG
673 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
674 +SET SESSION query_exec_time=0.31;
675 +SELECT 1;
676@@ -1655,18 +1931,18 @@
677 +query_response_time_range_base 156
678 +SHOW QUERY_RESPONSE_TIME;
679 +
680-+ 0.000041 25 0.000000
681++ 0.000041 24 0.000000
682 + 0.006410 0 0.000000
683-+ 1.000000 13 4.250000
684++ 1.000000 11 4.050000
685 + 156.000000 11 25.700000
686 + 24336.000000 0 0.000000
687 + 3796416.00000 0 0.000000
688 +TOO LONG 0 TOO LONG
689 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
690 +time count total
691-+ 0.000041 25 0.000000
692++ 0.000041 24 0.000000
693 + 0.006410 0 0.000000
694-+ 1.000000 14 4.350000
695++ 1.000000 11 4.050000
696 + 156.000000 11 25.700000
697 + 24336.000000 0 0.000000
698 + 3796416.00000 0 0.000000
699@@ -1676,6 +1952,22 @@
700 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
701 +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
702 +FLUSH QUERY_RESPONSE_TIME;
703++SHOW QUERY_RESPONSE_TIME;
704++
705++ 0.000001 0 0.000000
706++ 0.001000 0 0.000000
707++ 1.000000 0 0.000000
708++ 1000.000000 0 0.000000
709++ 1000000.00000 0 0.000000
710++TOO LONG 0 TOO LONG
711++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
712++time count total
713++ 0.000001 0 0.000000
714++ 0.001000 0 0.000000
715++ 1.000000 0 0.000000
716++ 1000.000000 0 0.000000
717++ 1000000.00000 0 0.000000
718++TOO LONG 0 TOO LONG
719 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
720 +SET SESSION query_exec_time=0.31;
721 +SELECT 1;
722@@ -1772,17 +2064,17 @@
723 +query_response_time_range_base 1000
724 +SHOW QUERY_RESPONSE_TIME;
725 +
726-+ 0.000001 25 0.000000
727++ 0.000001 24 0.000000
728 + 0.001000 0 0.000000
729-+ 1.000000 13 4.250000
730++ 1.000000 11 4.050000
731 + 1000.000000 11 25.700000
732 + 1000000.00000 0 0.000000
733 +TOO LONG 0 TOO LONG
734 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
735 +time count total
736-+ 0.000001 25 0.000000
737++ 0.000001 24 0.000000
738 + 0.001000 0 0.000000
739-+ 1.000000 14 4.350000
740++ 1.000000 11 4.050000
741 + 1000.000000 11 25.700000
742 + 1000000.00000 0 0.000000
743 +TOO LONG 0 TOO LONG
744@@ -1793,6 +2085,22 @@
745 +Warnings:
746 +Warning 1292 Truncated incorrect query_response_time_range_base value: '1001'
747 +FLUSH QUERY_RESPONSE_TIME;
748++SHOW QUERY_RESPONSE_TIME;
749++
750++ 0.000001 0 0.000000
751++ 0.001000 0 0.000000
752++ 1.000000 0 0.000000
753++ 1000.000000 0 0.000000
754++ 1000000.00000 0 0.000000
755++TOO LONG 0 TOO LONG
756++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
757++time count total
758++ 0.000001 0 0.000000
759++ 0.001000 0 0.000000
760++ 1.000000 0 0.000000
761++ 1000.000000 0 0.000000
762++ 1000000.00000 0 0.000000
763++TOO LONG 0 TOO LONG
764 +SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
765 +SET SESSION query_exec_time=0.31;
766 +SELECT 1;
767@@ -1889,17 +2197,17 @@
768 +query_response_time_range_base 1000
769 +SHOW QUERY_RESPONSE_TIME;
770 +
771-+ 0.000001 25 0.000000
772++ 0.000001 24 0.000000
773 + 0.001000 0 0.000000
774-+ 1.000000 13 4.250000
775++ 1.000000 11 4.050000
776 + 1000.000000 11 25.700000
777 + 1000000.00000 0 0.000000
778 +TOO LONG 0 TOO LONG
779 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
780 +time count total
781-+ 0.000001 25 0.000000
782++ 0.000001 24 0.000000
783 + 0.001000 0 0.000000
784-+ 1.000000 14 4.350000
785++ 1.000000 11 4.050000
786 + 1000.000000 11 25.700000
787 + 1000000.00000 0 0.000000
788 +TOO LONG 0 TOO LONG
789@@ -1952,7 +2260,7 @@
790 +query_response_time_range_base 2
791 +SHOW QUERY_RESPONSE_TIME;
792 +
793-+ 0.000001 46 0.000000
794++ 0.000001 45 0.000000
795 + 0.000003 0 0.000000
796 + 0.000007 0 0.000000
797 + 0.000015 0 0.000000
798@@ -1968,7 +2276,7 @@
799 + 0.015625 0 0.000000
800 + 0.031250 0 0.000000
801 + 0.062500 0 0.000000
802-+ 0.125000 46 4.600000
803++ 0.125000 44 4.400000
804 + 0.250000 0 0.000000
805 + 0.500000 10 3.550000
806 + 1.000000 1 0.500000
807@@ -1998,7 +2306,7 @@
808 +TOO LONG 0 TOO LONG
809 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
810 +time count total
811-+ 0.000001 46 0.000000
812++ 0.000001 45 0.000000
813 + 0.000003 0 0.000000
814 + 0.000007 0 0.000000
815 + 0.000015 0 0.000000
816@@ -2014,7 +2322,7 @@
817 + 0.015625 0 0.000000
818 + 0.031250 0 0.000000
819 + 0.062500 0 0.000000
820-+ 0.125000 47 4.700000
821++ 0.125000 44 4.400000
822 + 0.250000 0 0.000000
823 + 0.500000 10 3.550000
824 + 1.000000 1 0.500000
825@@ -2076,7 +2384,7 @@
826 +query_response_time_range_base 2
827 +SHOW QUERY_RESPONSE_TIME;
828 +
829-+ 0.000001 46 0.000000
830++ 0.000001 45 0.000000
831 + 0.000003 0 0.000000
832 + 0.000007 0 0.000000
833 + 0.000015 0 0.000000
834@@ -2092,7 +2400,7 @@
835 + 0.015625 0 0.000000
836 + 0.031250 0 0.000000
837 + 0.062500 0 0.000000
838-+ 0.125000 46 4.600000
839++ 0.125000 44 4.400000
840 + 0.250000 0 0.000000
841 + 0.500000 10 3.550000
842 + 1.000000 1 0.500000
843@@ -2122,7 +2430,7 @@
844 +TOO LONG 0 TOO LONG
845 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
846 +time count total
847-+ 0.000001 46 0.000000
848++ 0.000001 45 0.000000
849 + 0.000003 0 0.000000
850 + 0.000007 0 0.000000
851 + 0.000015 0 0.000000
852@@ -2138,7 +2446,7 @@
853 + 0.015625 0 0.000000
854 + 0.031250 0 0.000000
855 + 0.062500 0 0.000000
856-+ 0.125000 47 4.700000
857++ 0.125000 44 4.400000
858 + 0.250000 0 0.000000
859 + 0.500000 10 3.550000
860 + 1.000000 1 0.500000
861@@ -2200,13 +2508,13 @@
862 +query_response_time_range_base 10
863 +SHOW QUERY_RESPONSE_TIME;
864 +
865-+ 0.000001 46 0.000000
866++ 0.000001 45 0.000000
867 + 0.000010 0 0.000000
868 + 0.000100 0 0.000000
869 + 0.001000 0 0.000000
870 + 0.010000 0 0.000000
871 + 0.100000 0 0.000000
872-+ 1.000000 57 8.650000
873++ 1.000000 55 8.450000
874 + 10.000000 11 25.700000
875 + 100.000000 0 0.000000
876 + 1000.000000 0 0.000000
877@@ -2216,13 +2524,13 @@
878 +TOO LONG 0 TOO LONG
879 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
880 +time count total
881-+ 0.000001 46 0.000000
882++ 0.000001 45 0.000000
883 + 0.000010 0 0.000000
884 + 0.000100 0 0.000000
885 + 0.001000 0 0.000000
886 + 0.010000 0 0.000000
887 + 0.100000 0 0.000000
888-+ 1.000000 58 8.750000
889++ 1.000000 55 8.450000
890 + 10.000000 11 25.700000
891 + 100.000000 0 0.000000
892 + 1000.000000 0 0.000000
893@@ -2264,13 +2572,13 @@
894 +query_response_time_range_base 7
895 +SHOW QUERY_RESPONSE_TIME;
896 +
897-+ 0.000001 46 0.000000
898++ 0.000001 45 0.000000
899 + 0.000008 0 0.000000
900 + 0.000059 0 0.000000
901 + 0.000416 0 0.000000
902 + 0.002915 0 0.000000
903 + 0.020408 0 0.000000
904-+ 0.142857 46 4.600000
905++ 0.142857 44 4.400000
906 + 1.000000 11 4.050000
907 + 7.000000 11 25.700000
908 + 49.000000 0 0.000000
909@@ -2283,13 +2591,13 @@
910 +TOO LONG 0 TOO LONG
911 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
912 +time count total
913-+ 0.000001 46 0.000000
914++ 0.000001 45 0.000000
915 + 0.000008 0 0.000000
916 + 0.000059 0 0.000000
917 + 0.000416 0 0.000000
918 + 0.002915 0 0.000000
919 + 0.020408 0 0.000000
920-+ 0.142857 47 4.700000
921++ 0.142857 44 4.400000
922 + 1.000000 11 4.050000
923 + 7.000000 11 25.700000
924 + 49.000000 0 0.000000
925@@ -2334,18 +2642,18 @@
926 +query_response_time_range_base 156
927 +SHOW QUERY_RESPONSE_TIME;
928 +
929-+ 0.000041 46 0.000000
930++ 0.000041 45 0.000000
931 + 0.006410 0 0.000000
932-+ 1.000000 57 8.650000
933++ 1.000000 55 8.450000
934 + 156.000000 11 25.700000
935 + 24336.000000 0 0.000000
936 + 3796416.00000 0 0.000000
937 +TOO LONG 0 TOO LONG
938 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
939 +time count total
940-+ 0.000041 46 0.000000
941++ 0.000041 45 0.000000
942 + 0.006410 0 0.000000
943-+ 1.000000 58 8.750000
944++ 1.000000 55 8.450000
945 + 156.000000 11 25.700000
946 + 24336.000000 0 0.000000
947 + 3796416.00000 0 0.000000
948@@ -2384,17 +2692,17 @@
949 +query_response_time_range_base 1000
950 +SHOW QUERY_RESPONSE_TIME;
951 +
952-+ 0.000001 46 0.000000
953++ 0.000001 45 0.000000
954 + 0.001000 0 0.000000
955-+ 1.000000 57 8.650000
956++ 1.000000 55 8.450000
957 + 1000.000000 11 25.700000
958 + 1000000.00000 0 0.000000
959 +TOO LONG 0 TOO LONG
960 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
961 +time count total
962-+ 0.000001 46 0.000000
963++ 0.000001 45 0.000000
964 + 0.001000 0 0.000000
965-+ 1.000000 58 8.750000
966++ 1.000000 55 8.450000
967 + 1000.000000 11 25.700000
968 + 1000000.00000 0 0.000000
969 +TOO LONG 0 TOO LONG
970@@ -2434,17 +2742,17 @@
971 +query_response_time_range_base 1000
972 +SHOW QUERY_RESPONSE_TIME;
973 +
974-+ 0.000001 46 0.000000
975++ 0.000001 45 0.000000
976 + 0.001000 0 0.000000
977-+ 1.000000 57 8.650000
978++ 1.000000 55 8.450000
979 + 1000.000000 11 25.700000
980 + 1000000.00000 0 0.000000
981 +TOO LONG 0 TOO LONG
982 +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
983 +time count total
984-+ 0.000001 46 0.000000
985++ 0.000001 45 0.000000
986 + 0.001000 0 0.000000
987-+ 1.000000 58 8.750000
988++ 1.000000 55 8.450000
989 + 1000.000000 11 25.700000
990 + 1000000.00000 0 0.000000
991 +TOO LONG 0 TOO LONG
992@@ -3119,17 +3427,20 @@
993
994 /**
995 @defgroup Runtime_Environment Runtime Environment
996-@@ -1777,6 +1778,9 @@
997+@@ -1777,6 +1778,12 @@
998
999 ulonglong end_utime_of_query= thd->current_utime();
1000 ulonglong query_exec_time= get_query_exec_time(thd, end_utime_of_query);
1001 +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
1002-+ query_response_time_collect(query_exec_time);
1003++ if (opt_enable_query_response_time_stats)
1004++ {
1005++ query_response_time_collect(query_exec_time);
1006++ }
1007 +#endif
1008
1009 /*
1010 Low long_query_time value most likely means user is debugging stuff and even
1011-@@ -1947,6 +1951,7 @@
1012+@@ -1947,6 +1954,7 @@
1013 case SCH_CHARSETS:
1014 case SCH_ENGINES:
1015 case SCH_COLLATIONS:
1016@@ -3137,7 +3448,7 @@
1017 case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
1018 case SCH_USER_PRIVILEGES:
1019 case SCH_SCHEMA_PRIVILEGES:
1020-@@ -7306,6 +7311,12 @@
1021+@@ -7306,6 +7314,12 @@
1022 init_global_index_stats();
1023 pthread_mutex_unlock(&LOCK_global_index_stats);
1024 }

Subscribers

People subscribed via source and target branches