Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/cxn-ptdebug-error-1394934 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.13

  1. cxn-ptdebug-error-1394934
  2. Merge into release-2.2.13
Proposed by Frank Cizmich
Status: Merged
Approved by: Daniel Nichter
Approved revision: 612
Merged at revision: 613
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/cxn-ptdebug-error-1394934
Merge into: lp:~percona-toolkit-dev/percona-toolkit/release-2.2.13
Diff against target: 95 lines (+0/-8)
8 files modified
bin/pt-config-diff (+0/-1)
bin/pt-deadlock-logger (+0/-1)
bin/pt-fk-error-logger (+0/-1)
bin/pt-kill (+0/-1)
bin/pt-online-schema-change (+0/-1)
bin/pt-table-checksum (+0/-1)
bin/pt-upgrade (+0/-1)
lib/Cxn.pm (+0/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/cxn-ptdebug-error-1394934
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+245156@code.launchpad.net

Description of the change

Cxn module failed when PTDEBUG was set.
Removed "Dumper" line.
Updated related tools.

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
=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff 2014-11-11 13:28:27 +0000
+++ bin/pt-config-diff 2014-12-18 20:34:15 +0000
@@ -2399,7 +2399,6 @@
2399 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";2399 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
2400 PTDEBUG && _d($cxn->name, $sql);2400 PTDEBUG && _d($cxn->name, $sql);
2401 my $row = $cxn->dbh->selectrow_arrayref($sql);2401 my $row = $cxn->dbh->selectrow_arrayref($sql);
2402 PTDEBUG && _d(Dumper($row));
2403 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;2402 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
24042403
2405}2404}
24062405
=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger 2014-11-11 13:28:27 +0000
+++ bin/pt-deadlock-logger 2014-12-18 20:34:15 +0000
@@ -2743,7 +2743,6 @@
2743 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";2743 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
2744 PTDEBUG && _d($cxn->name, $sql);2744 PTDEBUG && _d($cxn->name, $sql);
2745 my $row = $cxn->dbh->selectrow_arrayref($sql);2745 my $row = $cxn->dbh->selectrow_arrayref($sql);
2746 PTDEBUG && _d(Dumper($row));
2747 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;2746 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
27482747
2749}2748}
27502749
=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger 2014-11-11 13:28:27 +0000
+++ bin/pt-fk-error-logger 2014-12-18 20:34:15 +0000
@@ -1895,7 +1895,6 @@
1895 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";1895 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
1896 PTDEBUG && _d($cxn->name, $sql);1896 PTDEBUG && _d($cxn->name, $sql);
1897 my $row = $cxn->dbh->selectrow_arrayref($sql);1897 my $row = $cxn->dbh->selectrow_arrayref($sql);
1898 PTDEBUG && _d(Dumper($row));
1899 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;1898 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
19001899
1901}1900}
19021901
=== modified file 'bin/pt-kill'
--- bin/pt-kill 2014-11-11 13:28:27 +0000
+++ bin/pt-kill 2014-12-18 20:34:15 +0000
@@ -5262,7 +5262,6 @@
5262 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";5262 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
5263 PTDEBUG && _d($cxn->name, $sql);5263 PTDEBUG && _d($cxn->name, $sql);
5264 my $row = $cxn->dbh->selectrow_arrayref($sql);5264 my $row = $cxn->dbh->selectrow_arrayref($sql);
5265 PTDEBUG && _d(Dumper($row));
5266 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;5265 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
52675266
5268}5267}
52695268
=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change 2014-11-11 13:28:27 +0000
+++ bin/pt-online-schema-change 2014-12-18 20:34:15 +0000
@@ -3859,7 +3859,6 @@
3859 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";3859 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
3860 PTDEBUG && _d($cxn->name, $sql);3860 PTDEBUG && _d($cxn->name, $sql);
3861 my $row = $cxn->dbh->selectrow_arrayref($sql);3861 my $row = $cxn->dbh->selectrow_arrayref($sql);
3862 PTDEBUG && _d(Dumper($row));
3863 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;3862 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
38643863
3865}3864}
38663865
=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum 2014-11-11 13:28:27 +0000
+++ bin/pt-table-checksum 2014-12-18 20:34:15 +0000
@@ -3637,7 +3637,6 @@
3637 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";3637 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
3638 PTDEBUG && _d($cxn->name, $sql);3638 PTDEBUG && _d($cxn->name, $sql);
3639 my $row = $cxn->dbh->selectrow_arrayref($sql);3639 my $row = $cxn->dbh->selectrow_arrayref($sql);
3640 PTDEBUG && _d(Dumper($row));
3641 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;3640 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
36423641
3643}3642}
36443643
=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade 2014-11-11 13:28:27 +0000
+++ bin/pt-upgrade 2014-12-18 20:34:15 +0000
@@ -2568,7 +2568,6 @@
2568 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";2568 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
2569 PTDEBUG && _d($cxn->name, $sql);2569 PTDEBUG && _d($cxn->name, $sql);
2570 my $row = $cxn->dbh->selectrow_arrayref($sql);2570 my $row = $cxn->dbh->selectrow_arrayref($sql);
2571 PTDEBUG && _d(Dumper($row));
2572 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;2571 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
25732572
2574}2573}
25752574
=== modified file 'lib/Cxn.pm'
--- lib/Cxn.pm 2014-11-05 22:21:51 +0000
+++ lib/Cxn.pm 2014-12-18 20:34:15 +0000
@@ -234,7 +234,6 @@
234 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";234 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
235 PTDEBUG && _d($cxn->name, $sql);235 PTDEBUG && _d($cxn->name, $sql);
236 my $row = $cxn->dbh->selectrow_arrayref($sql);236 my $row = $cxn->dbh->selectrow_arrayref($sql);
237 PTDEBUG && _d(Dumper($row));
238 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;237 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
239238
240}239}

Subscribers

People subscribed via source and target branches

to all changes: