Merge lp:~percona-dev/percona-server/fix-714884 into lp:~percona-dev/percona-server/5.5.8
- fix-714884
- 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Fred Linhoss (community) | documentation | Approve | |
Review via email: mp+48972@code.launchpad.net |
Commit message
Description of the change
Renamed "enable_
This should be reflected in documentation.
To post a comment you must log in.
Revision history for this message
Fred Linhoss (fred-linhoss) wrote : | # |
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
1 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result' |
2 | --- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-01-17 01:49:51 +0000 |
3 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-02-08 19:59:30 +0000 |
4 | @@ -22,7 +22,7 @@ |
5 | Variable_name Value |
6 | query_response_time_range_base 10 |
7 | FLUSH QUERY_RESPONSE_TIME; |
8 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON; |
9 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON; |
10 | INSERT INTO t SELECT SLEEP(0.4); |
11 | Warnings: |
12 | Note 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. |
13 | @@ -66,5 +66,5 @@ |
14 | 3 |
15 | DROP TABLE IF EXISTS t; |
16 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; |
17 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF; |
18 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF; |
19 | SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; |
20 | |
21 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test' |
22 | --- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-01-17 01:49:51 +0000 |
23 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-02-08 19:59:30 +0000 |
24 | @@ -20,7 +20,7 @@ |
25 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; |
26 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
27 | source include/percona_query_response_time_flush.inc; |
28 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON; |
29 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON; |
30 | |
31 | connection master; |
32 | INSERT INTO t SELECT SLEEP(0.4); |
33 | @@ -53,5 +53,5 @@ |
34 | sync_slave_with_master; |
35 | connection slave; |
36 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; |
37 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF; |
38 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF; |
39 | SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; |
40 | |
41 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result' |
42 | --- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result 2010-12-09 18:30:58 +0000 |
43 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result 2011-02-08 19:59:30 +0000 |
44 | @@ -79,20 +79,20 @@ |
45 | 4194304.00000 |
46 | 8388608.00000 |
47 | TOO LONG |
48 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
49 | -SELECT test_f(); |
50 | -test_f() |
51 | -Hello, world! |
52 | -SELECT test_f(); |
53 | -test_f() |
54 | -Hello, world! |
55 | -SELECT test_f(); |
56 | -test_f() |
57 | -Hello, world! |
58 | -SELECT test_f(); |
59 | -test_f() |
60 | -Hello, world! |
61 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
62 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
63 | +SELECT test_f(); |
64 | +test_f() |
65 | +Hello, world! |
66 | +SELECT test_f(); |
67 | +test_f() |
68 | +Hello, world! |
69 | +SELECT test_f(); |
70 | +test_f() |
71 | +Hello, world! |
72 | +SELECT test_f(); |
73 | +test_f() |
74 | +Hello, world! |
75 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
76 | SELECT d.count, |
77 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
78 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
79 | @@ -158,11 +158,11 @@ |
80 | Variable_name Value |
81 | query_response_time_range_base 10 |
82 | FLUSH QUERY_RESPONSE_TIME; |
83 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
84 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
85 | SELECT test_f(); |
86 | test_f() |
87 | Hello, world! |
88 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
89 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
90 | SELECT d.count, |
91 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
92 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
93 | @@ -198,11 +198,11 @@ |
94 | Variable_name Value |
95 | query_response_time_range_base 7 |
96 | FLUSH QUERY_RESPONSE_TIME; |
97 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
98 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
99 | SELECT test_f(); |
100 | test_f() |
101 | Hello, world! |
102 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
103 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
104 | SELECT d.count, |
105 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
106 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
107 | @@ -241,11 +241,11 @@ |
108 | Variable_name Value |
109 | query_response_time_range_base 156 |
110 | FLUSH QUERY_RESPONSE_TIME; |
111 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
112 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
113 | SELECT test_f(); |
114 | test_f() |
115 | Hello, world! |
116 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
117 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
118 | SELECT d.count, |
119 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
120 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
121 | @@ -274,11 +274,11 @@ |
122 | Variable_name Value |
123 | query_response_time_range_base 1000 |
124 | FLUSH QUERY_RESPONSE_TIME; |
125 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
126 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
127 | SELECT test_f(); |
128 | test_f() |
129 | Hello, world! |
130 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
131 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
132 | SELECT d.count, |
133 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
134 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
135 | @@ -307,7 +307,7 @@ |
136 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
137 | Variable_name Value |
138 | query_response_time_range_base 1000 |
139 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
140 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
141 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; |
142 | DROP FUNCTION test_f; |
143 | SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; |
144 | |
145 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test' |
146 | --- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test 2011-01-17 01:49:51 +0000 |
147 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test 2011-02-08 19:59:30 +0000 |
148 | @@ -26,12 +26,12 @@ |
149 | source include/percona_query_response_time_flush.inc; |
150 | source include/percona_query_response_time_show.inc; |
151 | |
152 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
153 | -SELECT test_f(); |
154 | -SELECT test_f(); |
155 | -SELECT test_f(); |
156 | -SELECT test_f(); |
157 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
158 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
159 | +SELECT test_f(); |
160 | +SELECT test_f(); |
161 | +SELECT test_f(); |
162 | +SELECT test_f(); |
163 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
164 | |
165 | source include/percona_query_response_time_show.inc; |
166 | |
167 | @@ -40,9 +40,9 @@ |
168 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
169 | |
170 | source include/percona_query_response_time_flush.inc; |
171 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
172 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
173 | SELECT test_f(); |
174 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
175 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
176 | |
177 | source include/percona_query_response_time_show.inc; |
178 | |
179 | @@ -51,9 +51,9 @@ |
180 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
181 | |
182 | source include/percona_query_response_time_flush.inc; |
183 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
184 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
185 | SELECT test_f(); |
186 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
187 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
188 | |
189 | source include/percona_query_response_time_show.inc; |
190 | |
191 | @@ -62,9 +62,9 @@ |
192 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
193 | |
194 | source include/percona_query_response_time_flush.inc; |
195 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
196 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
197 | SELECT test_f(); |
198 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
199 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
200 | |
201 | source include/percona_query_response_time_show.inc; |
202 | |
203 | @@ -73,9 +73,9 @@ |
204 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
205 | |
206 | source include/percona_query_response_time_flush.inc; |
207 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
208 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
209 | SELECT test_f(); |
210 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
211 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
212 | |
213 | source include/percona_query_response_time_show.inc; |
214 | |
215 | @@ -83,7 +83,7 @@ |
216 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; |
217 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
218 | |
219 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
220 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
221 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; |
222 | |
223 | DROP FUNCTION test_f; |
224 | |
225 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time.result' |
226 | --- mysql-test/response-time-distribution.patch/percona_query_response_time.result 2010-12-09 18:30:58 +0000 |
227 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time.result 2011-02-08 19:59:30 +0000 |
228 | @@ -66,7 +66,7 @@ |
229 | 4194304.00000 |
230 | 8388608.00000 |
231 | TOO LONG |
232 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
233 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
234 | SELECT SLEEP(0.31); |
235 | SLEEP(0.31) |
236 | 0 |
237 | @@ -124,7 +124,7 @@ |
238 | SELECT SLEEP(2.5); |
239 | SLEEP(2.5) |
240 | 0 |
241 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
242 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
243 | SELECT d.count, |
244 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
245 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
246 | @@ -193,7 +193,7 @@ |
247 | Variable_name Value |
248 | query_response_time_range_base 10 |
249 | FLUSH QUERY_RESPONSE_TIME; |
250 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
251 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
252 | SELECT SLEEP(0.31); |
253 | SLEEP(0.31) |
254 | 0 |
255 | @@ -251,7 +251,7 @@ |
256 | SELECT SLEEP(2.5); |
257 | SLEEP(2.5) |
258 | 0 |
259 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
260 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
261 | SELECT d.count, |
262 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
263 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
264 | @@ -288,7 +288,7 @@ |
265 | Variable_name Value |
266 | query_response_time_range_base 7 |
267 | FLUSH QUERY_RESPONSE_TIME; |
268 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
269 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
270 | SELECT SLEEP(0.31); |
271 | SLEEP(0.31) |
272 | 0 |
273 | @@ -346,7 +346,7 @@ |
274 | SELECT SLEEP(2.5); |
275 | SLEEP(2.5) |
276 | 0 |
277 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
278 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
279 | SELECT d.count, |
280 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
281 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
282 | @@ -386,7 +386,7 @@ |
283 | Variable_name Value |
284 | query_response_time_range_base 156 |
285 | FLUSH QUERY_RESPONSE_TIME; |
286 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
287 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
288 | SELECT SLEEP(0.31); |
289 | SLEEP(0.31) |
290 | 0 |
291 | @@ -444,7 +444,7 @@ |
292 | SELECT SLEEP(2.5); |
293 | SLEEP(2.5) |
294 | 0 |
295 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
296 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
297 | SELECT d.count, |
298 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
299 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
300 | @@ -474,7 +474,7 @@ |
301 | Variable_name Value |
302 | query_response_time_range_base 1000 |
303 | FLUSH QUERY_RESPONSE_TIME; |
304 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
305 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
306 | SELECT SLEEP(0.31); |
307 | SLEEP(0.31) |
308 | 0 |
309 | @@ -532,7 +532,7 @@ |
310 | SELECT SLEEP(2.5); |
311 | SLEEP(2.5) |
312 | 0 |
313 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
314 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
315 | SELECT d.count, |
316 | (SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, |
317 | (SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, |
318 | @@ -562,6 +562,6 @@ |
319 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
320 | Variable_name Value |
321 | query_response_time_range_base 1000 |
322 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
323 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
324 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; |
325 | SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; |
326 | |
327 | === modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time.test' |
328 | --- mysql-test/response-time-distribution.patch/percona_query_response_time.test 2011-01-17 01:49:51 +0000 |
329 | +++ mysql-test/response-time-distribution.patch/percona_query_response_time.test 2011-02-08 19:59:30 +0000 |
330 | @@ -9,9 +9,9 @@ |
331 | source include/percona_query_response_time_flush.inc; |
332 | source include/percona_query_response_time_show.inc; |
333 | |
334 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
335 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
336 | source include/percona_query_response_time_sleep.inc; |
337 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
338 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
339 | |
340 | source include/percona_query_response_time_show.inc; |
341 | |
342 | @@ -20,9 +20,9 @@ |
343 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
344 | |
345 | source include/percona_query_response_time_flush.inc; |
346 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
347 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
348 | source include/percona_query_response_time_sleep.inc; |
349 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
350 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
351 | |
352 | source include/percona_query_response_time_show.inc; |
353 | |
354 | @@ -31,9 +31,9 @@ |
355 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
356 | |
357 | source include/percona_query_response_time_flush.inc; |
358 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
359 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
360 | source include/percona_query_response_time_sleep.inc; |
361 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
362 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
363 | |
364 | source include/percona_query_response_time_show.inc; |
365 | |
366 | @@ -42,9 +42,9 @@ |
367 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
368 | |
369 | source include/percona_query_response_time_flush.inc; |
370 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
371 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
372 | source include/percona_query_response_time_sleep.inc; |
373 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
374 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
375 | |
376 | source include/percona_query_response_time_show.inc; |
377 | |
378 | @@ -53,9 +53,9 @@ |
379 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
380 | |
381 | source include/percona_query_response_time_flush.inc; |
382 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; |
383 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; |
384 | source include/percona_query_response_time_sleep.inc; |
385 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
386 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
387 | |
388 | source include/percona_query_response_time_show.inc; |
389 | |
390 | @@ -63,6 +63,6 @@ |
391 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; |
392 | SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; |
393 | |
394 | -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; |
395 | +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; |
396 | SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; |
397 | SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; |
398 | |
399 | === modified file 'response_time_distribution.patch' |
400 | --- response_time_distribution.patch 2011-01-17 01:49:51 +0000 |
401 | +++ response_time_distribution.patch 2011-02-08 19:59:30 +0000 |
402 | @@ -124,7 +124,7 @@ |
403 | #endif |
404 | +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION |
405 | +ulong opt_query_response_time_range_base = QRT_DEFAULT_BASE; |
406 | -+my_bool opt_enable_query_response_time_stats= 0; |
407 | ++my_bool opt_query_response_time_stats= 0; |
408 | +#endif // HAVE_RESPONSE_TIME_DISTRIBUTION |
409 | |
410 | my_bool opt_use_ssl = 0; |
411 | @@ -170,7 +170,7 @@ |
412 | extern bool opt_ignore_builtin_innodb; |
413 | +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION |
414 | +extern ulong opt_query_response_time_range_base; |
415 | -+extern my_bool opt_enable_query_response_time_stats; |
416 | ++extern my_bool opt_query_response_time_stats; |
417 | +#endif // HAVE_RESPONSE_TIME_DISTRIBUTION |
418 | extern my_bool opt_character_set_client_handshake; |
419 | extern bool volatile abort_loop; |
420 | @@ -653,7 +653,7 @@ |
421 | set. |
422 | */ |
423 | + #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION |
424 | -+ if (opt_enable_query_response_time_stats || thd->enable_slow_log) |
425 | ++ if (opt_query_response_time_stats || thd->enable_slow_log) |
426 | +#else // HAVE_RESPONSE_TIME_DISTRIBUTION |
427 | if (thd->enable_slow_log) |
428 | +#endif // HAVE_RESPONSE_TIME_DISTRIBUTION |
429 | @@ -670,7 +670,7 @@ |
430 | + ulonglong end_utime_of_query = thd->current_utime(); |
431 | + ulonglong query_execution_time = end_utime_of_query - thd->utime_after_lock; |
432 | +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION |
433 | -+ if(opt_enable_query_response_time_stats) |
434 | ++ if(opt_query_response_time_stats) |
435 | + { |
436 | + query_response_time_collect(query_execution_time); |
437 | + } |
438 | @@ -839,16 +839,16 @@ |
439 | + READ_ONLY GLOBAL_VAR(have_response_time_distribution), NO_CMD_LINE); |
440 | + |
441 | +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION |
442 | -+static Sys_var_mybool Sys_enable_query_response_time_stats( |
443 | -+ "enable_query_response_time_stats", "Enable or disable query response time statisics collecting", |
444 | -+ GLOBAL_VAR(opt_enable_query_response_time_stats), CMD_LINE(OPT_ARG), |
445 | ++static Sys_var_mybool Sys_query_response_time_stats( |
446 | ++ "query_response_time_stats", "Enable or disable query response time statisics collecting", |
447 | ++ GLOBAL_VAR(opt_query_response_time_stats), CMD_LINE(OPT_ARG), |
448 | + DEFAULT(FALSE)); |
449 | + |
450 | +static Sys_var_ulong Sys_query_response_time_range_base( |
451 | + "query_response_time_range_base", |
452 | + "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush", |
453 | + GLOBAL_VAR(opt_query_response_time_range_base), |
454 | -+ CMD_LINE(REQUIRED_ARG), VALID_RANGE(2, QRT_MAXIMUM_BASE), |
455 | ++ CMD_LINE(OPT_ARG), VALID_RANGE(2, QRT_MAXIMUM_BASE), |
456 | + DEFAULT(QRT_DEFAULT_BASE), |
457 | + BLOCK_SIZE(1)); |
458 | +#endif // HAVE_RESPONSE_TIME_DISTRIBUTION |
response_ time_distributi on wiki page updated for 5.5.8 (currently in https:/ /intranet. percona. com/dokuwiki/ per:fred: docs-5. 5:response_ time_distributi on)