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

Proposed by Frank Cizmich on 2014-12-18
Status: Merged
Approved by: Daniel Nichter on 2015-01-08
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 2014-12-18 Approve on 2015-01-08
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.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-config-diff'
2--- bin/pt-config-diff 2014-11-11 13:28:27 +0000
3+++ bin/pt-config-diff 2014-12-18 20:34:15 +0000
4@@ -2399,7 +2399,6 @@
5 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
6 PTDEBUG && _d($cxn->name, $sql);
7 my $row = $cxn->dbh->selectrow_arrayref($sql);
8- PTDEBUG && _d(Dumper($row));
9 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
10
11 }
12
13=== modified file 'bin/pt-deadlock-logger'
14--- bin/pt-deadlock-logger 2014-11-11 13:28:27 +0000
15+++ bin/pt-deadlock-logger 2014-12-18 20:34:15 +0000
16@@ -2743,7 +2743,6 @@
17 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
18 PTDEBUG && _d($cxn->name, $sql);
19 my $row = $cxn->dbh->selectrow_arrayref($sql);
20- PTDEBUG && _d(Dumper($row));
21 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
22
23 }
24
25=== modified file 'bin/pt-fk-error-logger'
26--- bin/pt-fk-error-logger 2014-11-11 13:28:27 +0000
27+++ bin/pt-fk-error-logger 2014-12-18 20:34:15 +0000
28@@ -1895,7 +1895,6 @@
29 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
30 PTDEBUG && _d($cxn->name, $sql);
31 my $row = $cxn->dbh->selectrow_arrayref($sql);
32- PTDEBUG && _d(Dumper($row));
33 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
34
35 }
36
37=== modified file 'bin/pt-kill'
38--- bin/pt-kill 2014-11-11 13:28:27 +0000
39+++ bin/pt-kill 2014-12-18 20:34:15 +0000
40@@ -5262,7 +5262,6 @@
41 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
42 PTDEBUG && _d($cxn->name, $sql);
43 my $row = $cxn->dbh->selectrow_arrayref($sql);
44- PTDEBUG && _d(Dumper($row));
45 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
46
47 }
48
49=== modified file 'bin/pt-online-schema-change'
50--- bin/pt-online-schema-change 2014-11-11 13:28:27 +0000
51+++ bin/pt-online-schema-change 2014-12-18 20:34:15 +0000
52@@ -3859,7 +3859,6 @@
53 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
54 PTDEBUG && _d($cxn->name, $sql);
55 my $row = $cxn->dbh->selectrow_arrayref($sql);
56- PTDEBUG && _d(Dumper($row));
57 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
58
59 }
60
61=== modified file 'bin/pt-table-checksum'
62--- bin/pt-table-checksum 2014-11-11 13:28:27 +0000
63+++ bin/pt-table-checksum 2014-12-18 20:34:15 +0000
64@@ -3637,7 +3637,6 @@
65 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
66 PTDEBUG && _d($cxn->name, $sql);
67 my $row = $cxn->dbh->selectrow_arrayref($sql);
68- PTDEBUG && _d(Dumper($row));
69 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
70
71 }
72
73=== modified file 'bin/pt-upgrade'
74--- bin/pt-upgrade 2014-11-11 13:28:27 +0000
75+++ bin/pt-upgrade 2014-12-18 20:34:15 +0000
76@@ -2568,7 +2568,6 @@
77 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
78 PTDEBUG && _d($cxn->name, $sql);
79 my $row = $cxn->dbh->selectrow_arrayref($sql);
80- PTDEBUG && _d(Dumper($row));
81 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
82
83 }
84
85=== modified file 'lib/Cxn.pm'
86--- lib/Cxn.pm 2014-11-05 22:21:51 +0000
87+++ lib/Cxn.pm 2014-12-18 20:34:15 +0000
88@@ -234,7 +234,6 @@
89 my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
90 PTDEBUG && _d($cxn->name, $sql);
91 my $row = $cxn->dbh->selectrow_arrayref($sql);
92- PTDEBUG && _d(Dumper($row));
93 return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
94
95 }

Subscribers

People subscribed via source and target branches

to all changes: