Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pqd-stats-bug-1249149 into lp:percona-toolkit/2.2

Proposed by Daniel Nichter
Status: Merged
Approved by: Daniel Nichter
Approved revision: 594
Merged at revision: 592
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-pqd-stats-bug-1249149
Merge into: lp:percona-toolkit/2.2
Diff against target: 551 lines (+83/-83)
27 files modified
bin/pt-agent (+3/-3)
bin/pt-align (+3/-3)
bin/pt-archiver (+3/-3)
bin/pt-config-diff (+3/-3)
bin/pt-deadlock-logger (+3/-3)
bin/pt-diskstats (+3/-3)
bin/pt-duplicate-key-checker (+3/-3)
bin/pt-fifo-split (+3/-3)
bin/pt-find (+3/-3)
bin/pt-fingerprint (+3/-3)
bin/pt-fk-error-logger (+3/-3)
bin/pt-heartbeat (+3/-3)
bin/pt-index-usage (+3/-3)
bin/pt-kill (+3/-3)
bin/pt-online-schema-change (+3/-3)
bin/pt-query-digest (+5/-5)
bin/pt-show-grants (+3/-3)
bin/pt-slave-delay (+3/-3)
bin/pt-slave-find (+3/-3)
bin/pt-slave-restart (+3/-3)
bin/pt-table-checksum (+3/-3)
bin/pt-table-sync (+3/-3)
bin/pt-table-usage (+3/-3)
bin/pt-upgrade (+3/-3)
bin/pt-variable-advisor (+3/-3)
bin/pt-visual-explain (+3/-3)
lib/OptionParser.pm (+3/-3)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-pqd-stats-bug-1249149
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+194432@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-agent'
2--- bin/pt-agent 2013-10-22 05:56:20 +0000
3+++ bin/pt-agent 2013-11-08 01:49:44 +0000
4@@ -3612,12 +3612,12 @@
5 }
6
7 if ( PTDEBUG ) {
8- print '# ', $^X, ' ', $], "\n";
9+ print STDERR '# ', $^X, ' ', $], "\n";
10 if ( my $uname = `uname -a` ) {
11 $uname =~ s/\s+/ /g;
12- print "# $uname\n";
13+ print STDERR "# $uname\n";
14 }
15- print '# Arguments: ',
16+ print STDERR '# Arguments: ',
17 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
18 }
19
20
21=== modified file 'bin/pt-align'
22--- bin/pt-align 2013-10-20 03:45:04 +0000
23+++ bin/pt-align 2013-11-08 01:49:44 +0000
24@@ -1077,12 +1077,12 @@
25 }
26
27 if ( PTDEBUG ) {
28- print '# ', $^X, ' ', $], "\n";
29+ print STDERR '# ', $^X, ' ', $], "\n";
30 if ( my $uname = `uname -a` ) {
31 $uname =~ s/\s+/ /g;
32- print "# $uname\n";
33+ print STDERR "# $uname\n";
34 }
35- print '# Arguments: ',
36+ print STDERR '# Arguments: ',
37 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
38 }
39
40
41=== modified file 'bin/pt-archiver'
42--- bin/pt-archiver 2013-10-22 05:56:20 +0000
43+++ bin/pt-archiver 2013-11-08 01:49:44 +0000
44@@ -1804,12 +1804,12 @@
45 }
46
47 if ( PTDEBUG ) {
48- print '# ', $^X, ' ', $], "\n";
49+ print STDERR '# ', $^X, ' ', $], "\n";
50 if ( my $uname = `uname -a` ) {
51 $uname =~ s/\s+/ /g;
52- print "# $uname\n";
53+ print STDERR "# $uname\n";
54 }
55- print '# Arguments: ',
56+ print STDERR '# Arguments: ',
57 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
58 }
59
60
61=== modified file 'bin/pt-config-diff'
62--- bin/pt-config-diff 2013-10-22 05:56:20 +0000
63+++ bin/pt-config-diff 2013-11-08 01:49:44 +0000
64@@ -1804,12 +1804,12 @@
65 }
66
67 if ( PTDEBUG ) {
68- print '# ', $^X, ' ', $], "\n";
69+ print STDERR '# ', $^X, ' ', $], "\n";
70 if ( my $uname = `uname -a` ) {
71 $uname =~ s/\s+/ /g;
72- print "# $uname\n";
73+ print STDERR "# $uname\n";
74 }
75- print '# Arguments: ',
76+ print STDERR '# Arguments: ',
77 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
78 }
79
80
81=== modified file 'bin/pt-deadlock-logger'
82--- bin/pt-deadlock-logger 2013-10-22 05:56:20 +0000
83+++ bin/pt-deadlock-logger 2013-11-08 01:49:44 +0000
84@@ -1154,12 +1154,12 @@
85 }
86
87 if ( PTDEBUG ) {
88- print '# ', $^X, ' ', $], "\n";
89+ print STDERR '# ', $^X, ' ', $], "\n";
90 if ( my $uname = `uname -a` ) {
91 $uname =~ s/\s+/ /g;
92- print "# $uname\n";
93+ print STDERR "# $uname\n";
94 }
95- print '# Arguments: ',
96+ print STDERR '# Arguments: ',
97 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
98 }
99
100
101=== modified file 'bin/pt-diskstats'
102--- bin/pt-diskstats 2013-10-22 05:56:20 +0000
103+++ bin/pt-diskstats 2013-11-08 01:49:44 +0000
104@@ -1150,12 +1150,12 @@
105 }
106
107 if ( PTDEBUG ) {
108- print '# ', $^X, ' ', $], "\n";
109+ print STDERR '# ', $^X, ' ', $], "\n";
110 if ( my $uname = `uname -a` ) {
111 $uname =~ s/\s+/ /g;
112- print "# $uname\n";
113+ print STDERR "# $uname\n";
114 }
115- print '# Arguments: ',
116+ print STDERR '# Arguments: ',
117 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
118 }
119
120
121=== modified file 'bin/pt-duplicate-key-checker'
122--- bin/pt-duplicate-key-checker 2013-10-22 05:56:20 +0000
123+++ bin/pt-duplicate-key-checker 2013-11-08 01:49:44 +0000
124@@ -2136,12 +2136,12 @@
125 }
126
127 if ( PTDEBUG ) {
128- print '# ', $^X, ' ', $], "\n";
129+ print STDERR '# ', $^X, ' ', $], "\n";
130 if ( my $uname = `uname -a` ) {
131 $uname =~ s/\s+/ /g;
132- print "# $uname\n";
133+ print STDERR "# $uname\n";
134 }
135- print '# Arguments: ',
136+ print STDERR '# Arguments: ',
137 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
138 }
139
140
141=== modified file 'bin/pt-fifo-split'
142--- bin/pt-fifo-split 2013-10-20 03:45:04 +0000
143+++ bin/pt-fifo-split 2013-11-08 01:49:44 +0000
144@@ -1078,12 +1078,12 @@
145 }
146
147 if ( PTDEBUG ) {
148- print '# ', $^X, ' ', $], "\n";
149+ print STDERR '# ', $^X, ' ', $], "\n";
150 if ( my $uname = `uname -a` ) {
151 $uname =~ s/\s+/ /g;
152- print "# $uname\n";
153+ print STDERR "# $uname\n";
154 }
155- print '# Arguments: ',
156+ print STDERR '# Arguments: ',
157 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
158 }
159
160
161=== modified file 'bin/pt-find'
162--- bin/pt-find 2013-10-22 05:56:20 +0000
163+++ bin/pt-find 2013-11-08 01:49:44 +0000
164@@ -1570,12 +1570,12 @@
165 }
166
167 if ( PTDEBUG ) {
168- print '# ', $^X, ' ', $], "\n";
169+ print STDERR '# ', $^X, ' ', $], "\n";
170 if ( my $uname = `uname -a` ) {
171 $uname =~ s/\s+/ /g;
172- print "# $uname\n";
173+ print STDERR "# $uname\n";
174 }
175- print '# Arguments: ',
176+ print STDERR '# Arguments: ',
177 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
178 }
179
180
181=== modified file 'bin/pt-fingerprint'
182--- bin/pt-fingerprint 2013-10-20 03:45:04 +0000
183+++ bin/pt-fingerprint 2013-11-08 01:49:44 +0000
184@@ -1079,12 +1079,12 @@
185 }
186
187 if ( PTDEBUG ) {
188- print '# ', $^X, ' ', $], "\n";
189+ print STDERR '# ', $^X, ' ', $], "\n";
190 if ( my $uname = `uname -a` ) {
191 $uname =~ s/\s+/ /g;
192- print "# $uname\n";
193+ print STDERR "# $uname\n";
194 }
195- print '# Arguments: ',
196+ print STDERR '# Arguments: ',
197 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
198 }
199
200
201=== modified file 'bin/pt-fk-error-logger'
202--- bin/pt-fk-error-logger 2013-10-22 05:56:20 +0000
203+++ bin/pt-fk-error-logger 2013-11-08 01:49:44 +0000
204@@ -1149,12 +1149,12 @@
205 }
206
207 if ( PTDEBUG ) {
208- print '# ', $^X, ' ', $], "\n";
209+ print STDERR '# ', $^X, ' ', $], "\n";
210 if ( my $uname = `uname -a` ) {
211 $uname =~ s/\s+/ /g;
212- print "# $uname\n";
213+ print STDERR "# $uname\n";
214 }
215- print '# Arguments: ',
216+ print STDERR '# Arguments: ',
217 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
218 }
219
220
221=== modified file 'bin/pt-heartbeat'
222--- bin/pt-heartbeat 2013-10-22 05:56:20 +0000
223+++ bin/pt-heartbeat 2013-11-08 01:49:44 +0000
224@@ -1886,12 +1886,12 @@
225 }
226
227 if ( PTDEBUG ) {
228- print '# ', $^X, ' ', $], "\n";
229+ print STDERR '# ', $^X, ' ', $], "\n";
230 if ( my $uname = `uname -a` ) {
231 $uname =~ s/\s+/ /g;
232- print "# $uname\n";
233+ print STDERR "# $uname\n";
234 }
235- print '# Arguments: ',
236+ print STDERR '# Arguments: ',
237 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
238 }
239
240
241=== modified file 'bin/pt-index-usage'
242--- bin/pt-index-usage 2013-10-22 05:56:20 +0000
243+++ bin/pt-index-usage 2013-11-08 01:49:44 +0000
244@@ -1731,12 +1731,12 @@
245 }
246
247 if ( PTDEBUG ) {
248- print '# ', $^X, ' ', $], "\n";
249+ print STDERR '# ', $^X, ' ', $], "\n";
250 if ( my $uname = `uname -a` ) {
251 $uname =~ s/\s+/ /g;
252- print "# $uname\n";
253+ print STDERR "# $uname\n";
254 }
255- print '# Arguments: ',
256+ print STDERR '# Arguments: ',
257 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
258 }
259
260
261=== modified file 'bin/pt-kill'
262--- bin/pt-kill 2013-10-22 05:56:20 +0000
263+++ bin/pt-kill 2013-11-08 01:49:44 +0000
264@@ -1159,12 +1159,12 @@
265 }
266
267 if ( PTDEBUG ) {
268- print '# ', $^X, ' ', $], "\n";
269+ print STDERR '# ', $^X, ' ', $], "\n";
270 if ( my $uname = `uname -a` ) {
271 $uname =~ s/\s+/ /g;
272- print "# $uname\n";
273+ print STDERR "# $uname\n";
274 }
275- print '# Arguments: ',
276+ print STDERR '# Arguments: ',
277 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
278 }
279
280
281=== modified file 'bin/pt-online-schema-change'
282--- bin/pt-online-schema-change 2013-10-22 05:56:20 +0000
283+++ bin/pt-online-schema-change 2013-11-08 01:49:44 +0000
284@@ -1166,12 +1166,12 @@
285 }
286
287 if ( PTDEBUG ) {
288- print '# ', $^X, ' ', $], "\n";
289+ print STDERR '# ', $^X, ' ', $], "\n";
290 if ( my $uname = `uname -a` ) {
291 $uname =~ s/\s+/ /g;
292- print "# $uname\n";
293+ print STDERR "# $uname\n";
294 }
295- print '# Arguments: ',
296+ print STDERR '# Arguments: ',
297 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
298 }
299
300
301=== modified file 'bin/pt-query-digest'
302--- bin/pt-query-digest 2013-10-22 05:56:20 +0000
303+++ bin/pt-query-digest 2013-11-08 01:49:44 +0000
304@@ -2399,12 +2399,12 @@
305 }
306
307 if ( PTDEBUG ) {
308- print '# ', $^X, ' ', $], "\n";
309+ print STDERR '# ', $^X, ' ', $], "\n";
310 if ( my $uname = `uname -a` ) {
311 $uname =~ s/\s+/ /g;
312- print "# $uname\n";
313+ print STDERR "# $uname\n";
314 }
315- print '# Arguments: ',
316+ print STDERR '# Arguments: ',
317 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
318 }
319
320@@ -13730,10 +13730,10 @@
321 );
322 $stats{$stat} = 0; # Reset for next iteration.
323 }
324- print "\n" . $report->get_report();
325+ print STDERR "\n" . $report->get_report();
326 }
327 else {
328- print "\n# No statistics values.\n";
329+ print STDERR "\n# No statistics values.\n";
330 }
331 }
332
333
334=== modified file 'bin/pt-show-grants'
335--- bin/pt-show-grants 2013-10-20 03:45:04 +0000
336+++ bin/pt-show-grants 2013-11-08 01:49:44 +0000
337@@ -1079,12 +1079,12 @@
338 }
339
340 if ( PTDEBUG ) {
341- print '# ', $^X, ' ', $], "\n";
342+ print STDERR '# ', $^X, ' ', $], "\n";
343 if ( my $uname = `uname -a` ) {
344 $uname =~ s/\s+/ /g;
345- print "# $uname\n";
346+ print STDERR "# $uname\n";
347 }
348- print '# Arguments: ',
349+ print STDERR '# Arguments: ',
350 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
351 }
352
353
354=== modified file 'bin/pt-slave-delay'
355--- bin/pt-slave-delay 2013-10-22 05:56:20 +0000
356+++ bin/pt-slave-delay 2013-11-08 01:49:44 +0000
357@@ -1152,12 +1152,12 @@
358 }
359
360 if ( PTDEBUG ) {
361- print '# ', $^X, ' ', $], "\n";
362+ print STDERR '# ', $^X, ' ', $], "\n";
363 if ( my $uname = `uname -a` ) {
364 $uname =~ s/\s+/ /g;
365- print "# $uname\n";
366+ print STDERR "# $uname\n";
367 }
368- print '# Arguments: ',
369+ print STDERR '# Arguments: ',
370 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
371 }
372
373
374=== modified file 'bin/pt-slave-find'
375--- bin/pt-slave-find 2013-10-20 03:45:04 +0000
376+++ bin/pt-slave-find 2013-11-08 01:49:44 +0000
377@@ -1087,12 +1087,12 @@
378 }
379
380 if ( PTDEBUG ) {
381- print '# ', $^X, ' ', $], "\n";
382+ print STDERR '# ', $^X, ' ', $], "\n";
383 if ( my $uname = `uname -a` ) {
384 $uname =~ s/\s+/ /g;
385- print "# $uname\n";
386+ print STDERR "# $uname\n";
387 }
388- print '# Arguments: ',
389+ print STDERR '# Arguments: ',
390 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
391 }
392
393
394=== modified file 'bin/pt-slave-restart'
395--- bin/pt-slave-restart 2013-10-22 05:56:20 +0000
396+++ bin/pt-slave-restart 2013-11-08 01:49:44 +0000
397@@ -1304,12 +1304,12 @@
398 }
399
400 if ( PTDEBUG ) {
401- print '# ', $^X, ' ', $], "\n";
402+ print STDERR '# ', $^X, ' ', $], "\n";
403 if ( my $uname = `uname -a` ) {
404 $uname =~ s/\s+/ /g;
405- print "# $uname\n";
406+ print STDERR "# $uname\n";
407 }
408- print '# Arguments: ',
409+ print STDERR '# Arguments: ',
410 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
411 }
412
413
414=== modified file 'bin/pt-table-checksum'
415--- bin/pt-table-checksum 2013-10-22 05:56:20 +0000
416+++ bin/pt-table-checksum 2013-11-08 01:49:44 +0000
417@@ -2833,12 +2833,12 @@
418 }
419
420 if ( PTDEBUG ) {
421- print '# ', $^X, ' ', $], "\n";
422+ print STDERR '# ', $^X, ' ', $], "\n";
423 if ( my $uname = `uname -a` ) {
424 $uname =~ s/\s+/ /g;
425- print "# $uname\n";
426+ print STDERR "# $uname\n";
427 }
428- print '# Arguments: ',
429+ print STDERR '# Arguments: ',
430 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
431 }
432
433
434=== modified file 'bin/pt-table-sync'
435--- bin/pt-table-sync 2013-10-22 05:56:20 +0000
436+++ bin/pt-table-sync 2013-11-08 01:49:44 +0000
437@@ -1167,12 +1167,12 @@
438 }
439
440 if ( PTDEBUG ) {
441- print '# ', $^X, ' ', $], "\n";
442+ print STDERR '# ', $^X, ' ', $], "\n";
443 if ( my $uname = `uname -a` ) {
444 $uname =~ s/\s+/ /g;
445- print "# $uname\n";
446+ print STDERR "# $uname\n";
447 }
448- print '# Arguments: ',
449+ print STDERR '# Arguments: ',
450 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
451 }
452
453
454=== modified file 'bin/pt-table-usage'
455--- bin/pt-table-usage 2013-10-20 03:45:04 +0000
456+++ bin/pt-table-usage 2013-11-08 01:49:44 +0000
457@@ -1516,12 +1516,12 @@
458 }
459
460 if ( PTDEBUG ) {
461- print '# ', $^X, ' ', $], "\n";
462+ print STDERR '# ', $^X, ' ', $], "\n";
463 if ( my $uname = `uname -a` ) {
464 $uname =~ s/\s+/ /g;
465- print "# $uname\n";
466+ print STDERR "# $uname\n";
467 }
468- print '# Arguments: ',
469+ print STDERR '# Arguments: ',
470 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
471 }
472
473
474=== modified file 'bin/pt-upgrade'
475--- bin/pt-upgrade 2013-10-22 05:56:20 +0000
476+++ bin/pt-upgrade 2013-11-08 01:49:44 +0000
477@@ -2396,12 +2396,12 @@
478 }
479
480 if ( PTDEBUG ) {
481- print '# ', $^X, ' ', $], "\n";
482+ print STDERR '# ', $^X, ' ', $], "\n";
483 if ( my $uname = `uname -a` ) {
484 $uname =~ s/\s+/ /g;
485- print "# $uname\n";
486+ print STDERR "# $uname\n";
487 }
488- print '# Arguments: ',
489+ print STDERR '# Arguments: ',
490 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
491 }
492
493
494=== modified file 'bin/pt-variable-advisor'
495--- bin/pt-variable-advisor 2013-10-22 05:56:20 +0000
496+++ bin/pt-variable-advisor 2013-11-08 01:49:44 +0000
497@@ -1156,12 +1156,12 @@
498 }
499
500 if ( PTDEBUG ) {
501- print '# ', $^X, ' ', $], "\n";
502+ print STDERR '# ', $^X, ' ', $], "\n";
503 if ( my $uname = `uname -a` ) {
504 $uname =~ s/\s+/ /g;
505- print "# $uname\n";
506+ print STDERR "# $uname\n";
507 }
508- print '# Arguments: ',
509+ print STDERR '# Arguments: ',
510 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
511 }
512
513
514=== modified file 'bin/pt-visual-explain'
515--- bin/pt-visual-explain 2013-10-20 03:45:04 +0000
516+++ bin/pt-visual-explain 2013-11-08 01:49:44 +0000
517@@ -1753,12 +1753,12 @@
518 }
519
520 if ( PTDEBUG ) {
521- print '# ', $^X, ' ', $], "\n";
522+ print STDERR '# ', $^X, ' ', $], "\n";
523 if ( my $uname = `uname -a` ) {
524 $uname =~ s/\s+/ /g;
525- print "# $uname\n";
526+ print STDERR "# $uname\n";
527 }
528- print '# Arguments: ',
529+ print STDERR '# Arguments: ',
530 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
531 }
532
533
534=== modified file 'lib/OptionParser.pm'
535--- lib/OptionParser.pm 2013-08-08 02:02:11 +0000
536+++ lib/OptionParser.pm 2013-11-08 01:49:44 +0000
537@@ -1342,12 +1342,12 @@
538 # certainly include in all tools, but otherwise there's no real reason to put
539 # it here.
540 if ( PTDEBUG ) {
541- print '# ', $^X, ' ', $], "\n";
542+ print STDERR '# ', $^X, ' ', $], "\n";
543 if ( my $uname = `uname -a` ) {
544 $uname =~ s/\s+/ /g;
545- print "# $uname\n";
546+ print STDERR "# $uname\n";
547 }
548- print '# Arguments: ',
549+ print STDERR '# Arguments: ',
550 join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
551 }
552

Subscribers

People subscribed via source and target branches