percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-16 16:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Nichter
2013-11-07 18:05:43 -08:00
parent 39dc9c374a 1f35ab7654
commit 2c34f63f58
27 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-agent
View File

@@ -3612,12 +3612,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-align
View File

@@ -1077,12 +1077,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-archiver
View File

@@ -1804,12 +1804,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-config-diff
View File

@@ -1804,12 +1804,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-deadlock-logger
View File

@@ -1154,12 +1154,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-diskstats
View File

@@ -1150,12 +1150,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-duplicate-key-checker
View File

@@ -2136,12 +2136,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-fifo-split
View File

@@ -1078,12 +1078,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-find
View File

@@ -1570,12 +1570,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-fingerprint
View File

@@ -1079,12 +1079,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-fk-error-logger
View File

@@ -1149,12 +1149,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-heartbeat
View File

@@ -1886,12 +1886,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-index-usage
View File

@@ -1731,12 +1731,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-kill
View File

@@ -1159,12 +1159,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-online-schema-change
View File

@@ -1166,12 +1166,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

10
bin/pt-query-digest
View File

@@ -2399,12 +2399,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }
@@ -13730,10 +13730,10 @@ sub main {
); );
$stats{$stat} = 0; # Reset for next iteration. $stats{$stat} = 0; # Reset for next iteration.
} }
print "\n" . $report->get_report(); print STDERR "\n" . $report->get_report();
} }
else { else {
print "\n# No statistics values.\n"; print STDERR "\n# No statistics values.\n";
} }
} }

6
bin/pt-show-grants
View File

@@ -1079,12 +1079,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-slave-delay
View File

@@ -1152,12 +1152,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-slave-find
View File

@@ -1087,12 +1087,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-slave-restart
View File

@@ -1304,12 +1304,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-table-checksum
View File

@@ -2833,12 +2833,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-table-sync
View File

@@ -1167,12 +1167,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-table-usage
View File

@@ -1516,12 +1516,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-upgrade
View File

@@ -2396,12 +2396,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-variable-advisor
View File

@@ -1156,12 +1156,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
bin/pt-visual-explain
View File

@@ -1753,12 +1753,12 @@ sub _d {
} }
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }

6
lib/OptionParser.pm
View File

@@ -1342,12 +1342,12 @@ sub _d {
# certainly include in all tools, but otherwise there's no real reason to put # certainly include in all tools, but otherwise there's no real reason to put
# it here. # it here.
if ( PTDEBUG ) { if ( PTDEBUG ) {
print '# ', $^X, ' ', $], "\n"; print STDERR '# ', $^X, ' ', $], "\n";
if ( my $uname = `uname -a` ) { if ( my $uname = `uname -a` ) {
$uname =~ s/\s+/ /g; $uname =~ s/\s+/ /g;
print "# $uname\n"; print STDERR "# $uname\n";
} }
print '# Arguments: ', print STDERR '# Arguments: ',
join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
} }