Merge lp:~percona-toolkit-dev/percona-toolkit/fix-set-vars-bug-1182856 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4
- fix-set-vars-bug-1182856
- Merge into release-2.2.4
Proposed by
Daniel Nichter
Status: | Merged |
---|---|
Merged at revision: | 585 |
Proposed branch: | lp:~percona-toolkit-dev/percona-toolkit/fix-set-vars-bug-1182856 |
Merge into: | lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4 |
Diff against target: |
646 lines (+96/-54) 28 files modified
bin/pt-agent (+2/-2) bin/pt-align (+2/-2) bin/pt-archiver (+2/-2) bin/pt-config-diff (+2/-2) bin/pt-deadlock-logger (+2/-2) bin/pt-diskstats (+2/-2) bin/pt-duplicate-key-checker (+2/-2) bin/pt-fifo-split (+2/-2) bin/pt-find (+2/-2) bin/pt-fingerprint (+2/-2) bin/pt-fk-error-logger (+2/-2) bin/pt-heartbeat (+2/-2) bin/pt-index-usage (+2/-2) bin/pt-kill (+2/-2) bin/pt-online-schema-change (+2/-2) bin/pt-query-digest (+2/-2) bin/pt-show-grants (+2/-2) bin/pt-slave-delay (+2/-2) bin/pt-slave-find (+2/-2) bin/pt-slave-restart (+2/-2) bin/pt-table-checksum (+2/-2) bin/pt-table-sync (+2/-2) bin/pt-table-usage (+2/-2) bin/pt-upgrade (+2/-2) bin/pt-variable-advisor (+2/-2) bin/pt-visual-explain (+2/-2) lib/OptionParser.pm (+2/-2) t/lib/OptionParser.t (+42/-0) |
To merge this branch: | bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-set-vars-bug-1182856 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Nichter | Approve | ||
Review via email: mp+171429@code.launchpad.net |
Commit message
Description of the change
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-06-17 07:08:46 +0000 | |||
3 | +++ bin/pt-agent 2013-06-25 22:36:25 +0000 | |||
4 | @@ -3560,7 +3560,7 @@ | |||
5 | 3560 | if ( $user_vars ) { | 3560 | if ( $user_vars ) { |
6 | 3561 | foreach my $var_val ( @$user_vars ) { | 3561 | foreach my $var_val ( @$user_vars ) { |
7 | 3562 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 3562 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
9 | 3563 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 3563 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
10 | 3564 | $user_vars{$var} = { | 3564 | $user_vars{$var} = { |
11 | 3565 | val => $val, | 3565 | val => $val, |
12 | 3566 | default => 0, | 3566 | default => 0, |
13 | @@ -3574,7 +3574,7 @@ | |||
14 | 3574 | %default_vars = map { | 3574 | %default_vars = map { |
15 | 3575 | my $var_val = $_; | 3575 | my $var_val = $_; |
16 | 3576 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 3576 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
18 | 3577 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 3577 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
19 | 3578 | $var => { | 3578 | $var => { |
20 | 3579 | val => $val, | 3579 | val => $val, |
21 | 3580 | default => 1, | 3580 | default => 1, |
22 | 3581 | 3581 | ||
23 | === modified file 'bin/pt-align' | |||
24 | --- bin/pt-align 2013-06-17 07:08:46 +0000 | |||
25 | +++ bin/pt-align 2013-06-25 22:36:25 +0000 | |||
26 | @@ -1028,7 +1028,7 @@ | |||
27 | 1028 | if ( $user_vars ) { | 1028 | if ( $user_vars ) { |
28 | 1029 | foreach my $var_val ( @$user_vars ) { | 1029 | foreach my $var_val ( @$user_vars ) { |
29 | 1030 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1030 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
31 | 1031 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1031 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
32 | 1032 | $user_vars{$var} = { | 1032 | $user_vars{$var} = { |
33 | 1033 | val => $val, | 1033 | val => $val, |
34 | 1034 | default => 0, | 1034 | default => 0, |
35 | @@ -1042,7 +1042,7 @@ | |||
36 | 1042 | %default_vars = map { | 1042 | %default_vars = map { |
37 | 1043 | my $var_val = $_; | 1043 | my $var_val = $_; |
38 | 1044 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1044 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
40 | 1045 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1045 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
41 | 1046 | $var => { | 1046 | $var => { |
42 | 1047 | val => $val, | 1047 | val => $val, |
43 | 1048 | default => 1, | 1048 | default => 1, |
44 | 1049 | 1049 | ||
45 | === modified file 'bin/pt-archiver' | |||
46 | --- bin/pt-archiver 2013-06-17 07:08:46 +0000 | |||
47 | +++ bin/pt-archiver 2013-06-25 22:36:25 +0000 | |||
48 | @@ -1755,7 +1755,7 @@ | |||
49 | 1755 | if ( $user_vars ) { | 1755 | if ( $user_vars ) { |
50 | 1756 | foreach my $var_val ( @$user_vars ) { | 1756 | foreach my $var_val ( @$user_vars ) { |
51 | 1757 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1757 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
53 | 1758 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1758 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
54 | 1759 | $user_vars{$var} = { | 1759 | $user_vars{$var} = { |
55 | 1760 | val => $val, | 1760 | val => $val, |
56 | 1761 | default => 0, | 1761 | default => 0, |
57 | @@ -1769,7 +1769,7 @@ | |||
58 | 1769 | %default_vars = map { | 1769 | %default_vars = map { |
59 | 1770 | my $var_val = $_; | 1770 | my $var_val = $_; |
60 | 1771 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1771 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
62 | 1772 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1772 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
63 | 1773 | $var => { | 1773 | $var => { |
64 | 1774 | val => $val, | 1774 | val => $val, |
65 | 1775 | default => 1, | 1775 | default => 1, |
66 | 1776 | 1776 | ||
67 | === modified file 'bin/pt-config-diff' | |||
68 | --- bin/pt-config-diff 2013-06-17 07:08:46 +0000 | |||
69 | +++ bin/pt-config-diff 2013-06-25 22:36:25 +0000 | |||
70 | @@ -1755,7 +1755,7 @@ | |||
71 | 1755 | if ( $user_vars ) { | 1755 | if ( $user_vars ) { |
72 | 1756 | foreach my $var_val ( @$user_vars ) { | 1756 | foreach my $var_val ( @$user_vars ) { |
73 | 1757 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1757 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
75 | 1758 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1758 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
76 | 1759 | $user_vars{$var} = { | 1759 | $user_vars{$var} = { |
77 | 1760 | val => $val, | 1760 | val => $val, |
78 | 1761 | default => 0, | 1761 | default => 0, |
79 | @@ -1769,7 +1769,7 @@ | |||
80 | 1769 | %default_vars = map { | 1769 | %default_vars = map { |
81 | 1770 | my $var_val = $_; | 1770 | my $var_val = $_; |
82 | 1771 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1771 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
84 | 1772 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1772 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
85 | 1773 | $var => { | 1773 | $var => { |
86 | 1774 | val => $val, | 1774 | val => $val, |
87 | 1775 | default => 1, | 1775 | default => 1, |
88 | 1776 | 1776 | ||
89 | === modified file 'bin/pt-deadlock-logger' | |||
90 | --- bin/pt-deadlock-logger 2013-06-17 07:08:46 +0000 | |||
91 | +++ bin/pt-deadlock-logger 2013-06-25 22:36:25 +0000 | |||
92 | @@ -1105,7 +1105,7 @@ | |||
93 | 1105 | if ( $user_vars ) { | 1105 | if ( $user_vars ) { |
94 | 1106 | foreach my $var_val ( @$user_vars ) { | 1106 | foreach my $var_val ( @$user_vars ) { |
95 | 1107 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1107 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
97 | 1108 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1108 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
98 | 1109 | $user_vars{$var} = { | 1109 | $user_vars{$var} = { |
99 | 1110 | val => $val, | 1110 | val => $val, |
100 | 1111 | default => 0, | 1111 | default => 0, |
101 | @@ -1119,7 +1119,7 @@ | |||
102 | 1119 | %default_vars = map { | 1119 | %default_vars = map { |
103 | 1120 | my $var_val = $_; | 1120 | my $var_val = $_; |
104 | 1121 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1121 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
106 | 1122 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1122 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
107 | 1123 | $var => { | 1123 | $var => { |
108 | 1124 | val => $val, | 1124 | val => $val, |
109 | 1125 | default => 1, | 1125 | default => 1, |
110 | 1126 | 1126 | ||
111 | === modified file 'bin/pt-diskstats' | |||
112 | --- bin/pt-diskstats 2013-06-17 07:08:46 +0000 | |||
113 | +++ bin/pt-diskstats 2013-06-25 22:36:25 +0000 | |||
114 | @@ -1101,7 +1101,7 @@ | |||
115 | 1101 | if ( $user_vars ) { | 1101 | if ( $user_vars ) { |
116 | 1102 | foreach my $var_val ( @$user_vars ) { | 1102 | foreach my $var_val ( @$user_vars ) { |
117 | 1103 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1103 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
119 | 1104 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1104 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
120 | 1105 | $user_vars{$var} = { | 1105 | $user_vars{$var} = { |
121 | 1106 | val => $val, | 1106 | val => $val, |
122 | 1107 | default => 0, | 1107 | default => 0, |
123 | @@ -1115,7 +1115,7 @@ | |||
124 | 1115 | %default_vars = map { | 1115 | %default_vars = map { |
125 | 1116 | my $var_val = $_; | 1116 | my $var_val = $_; |
126 | 1117 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1117 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
128 | 1118 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1118 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
129 | 1119 | $var => { | 1119 | $var => { |
130 | 1120 | val => $val, | 1120 | val => $val, |
131 | 1121 | default => 1, | 1121 | default => 1, |
132 | 1122 | 1122 | ||
133 | === modified file 'bin/pt-duplicate-key-checker' | |||
134 | --- bin/pt-duplicate-key-checker 2013-06-17 07:08:46 +0000 | |||
135 | +++ bin/pt-duplicate-key-checker 2013-06-25 22:36:25 +0000 | |||
136 | @@ -2087,7 +2087,7 @@ | |||
137 | 2087 | if ( $user_vars ) { | 2087 | if ( $user_vars ) { |
138 | 2088 | foreach my $var_val ( @$user_vars ) { | 2088 | foreach my $var_val ( @$user_vars ) { |
139 | 2089 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2089 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
141 | 2090 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2090 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
142 | 2091 | $user_vars{$var} = { | 2091 | $user_vars{$var} = { |
143 | 2092 | val => $val, | 2092 | val => $val, |
144 | 2093 | default => 0, | 2093 | default => 0, |
145 | @@ -2101,7 +2101,7 @@ | |||
146 | 2101 | %default_vars = map { | 2101 | %default_vars = map { |
147 | 2102 | my $var_val = $_; | 2102 | my $var_val = $_; |
148 | 2103 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2103 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
150 | 2104 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2104 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
151 | 2105 | $var => { | 2105 | $var => { |
152 | 2106 | val => $val, | 2106 | val => $val, |
153 | 2107 | default => 1, | 2107 | default => 1, |
154 | 2108 | 2108 | ||
155 | === modified file 'bin/pt-fifo-split' | |||
156 | --- bin/pt-fifo-split 2013-06-17 07:08:46 +0000 | |||
157 | +++ bin/pt-fifo-split 2013-06-25 22:36:25 +0000 | |||
158 | @@ -1029,7 +1029,7 @@ | |||
159 | 1029 | if ( $user_vars ) { | 1029 | if ( $user_vars ) { |
160 | 1030 | foreach my $var_val ( @$user_vars ) { | 1030 | foreach my $var_val ( @$user_vars ) { |
161 | 1031 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1031 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
163 | 1032 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1032 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
164 | 1033 | $user_vars{$var} = { | 1033 | $user_vars{$var} = { |
165 | 1034 | val => $val, | 1034 | val => $val, |
166 | 1035 | default => 0, | 1035 | default => 0, |
167 | @@ -1043,7 +1043,7 @@ | |||
168 | 1043 | %default_vars = map { | 1043 | %default_vars = map { |
169 | 1044 | my $var_val = $_; | 1044 | my $var_val = $_; |
170 | 1045 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1045 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
172 | 1046 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1046 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
173 | 1047 | $var => { | 1047 | $var => { |
174 | 1048 | val => $val, | 1048 | val => $val, |
175 | 1049 | default => 1, | 1049 | default => 1, |
176 | 1050 | 1050 | ||
177 | === modified file 'bin/pt-find' | |||
178 | --- bin/pt-find 2013-06-17 07:08:46 +0000 | |||
179 | +++ bin/pt-find 2013-06-25 22:36:25 +0000 | |||
180 | @@ -1521,7 +1521,7 @@ | |||
181 | 1521 | if ( $user_vars ) { | 1521 | if ( $user_vars ) { |
182 | 1522 | foreach my $var_val ( @$user_vars ) { | 1522 | foreach my $var_val ( @$user_vars ) { |
183 | 1523 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1523 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
185 | 1524 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1524 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
186 | 1525 | $user_vars{$var} = { | 1525 | $user_vars{$var} = { |
187 | 1526 | val => $val, | 1526 | val => $val, |
188 | 1527 | default => 0, | 1527 | default => 0, |
189 | @@ -1535,7 +1535,7 @@ | |||
190 | 1535 | %default_vars = map { | 1535 | %default_vars = map { |
191 | 1536 | my $var_val = $_; | 1536 | my $var_val = $_; |
192 | 1537 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1537 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
194 | 1538 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1538 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
195 | 1539 | $var => { | 1539 | $var => { |
196 | 1540 | val => $val, | 1540 | val => $val, |
197 | 1541 | default => 1, | 1541 | default => 1, |
198 | 1542 | 1542 | ||
199 | === modified file 'bin/pt-fingerprint' | |||
200 | --- bin/pt-fingerprint 2013-06-17 07:08:46 +0000 | |||
201 | +++ bin/pt-fingerprint 2013-06-25 22:36:25 +0000 | |||
202 | @@ -1030,7 +1030,7 @@ | |||
203 | 1030 | if ( $user_vars ) { | 1030 | if ( $user_vars ) { |
204 | 1031 | foreach my $var_val ( @$user_vars ) { | 1031 | foreach my $var_val ( @$user_vars ) { |
205 | 1032 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1032 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
207 | 1033 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1033 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
208 | 1034 | $user_vars{$var} = { | 1034 | $user_vars{$var} = { |
209 | 1035 | val => $val, | 1035 | val => $val, |
210 | 1036 | default => 0, | 1036 | default => 0, |
211 | @@ -1044,7 +1044,7 @@ | |||
212 | 1044 | %default_vars = map { | 1044 | %default_vars = map { |
213 | 1045 | my $var_val = $_; | 1045 | my $var_val = $_; |
214 | 1046 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1046 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
216 | 1047 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1047 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
217 | 1048 | $var => { | 1048 | $var => { |
218 | 1049 | val => $val, | 1049 | val => $val, |
219 | 1050 | default => 1, | 1050 | default => 1, |
220 | 1051 | 1051 | ||
221 | === modified file 'bin/pt-fk-error-logger' | |||
222 | --- bin/pt-fk-error-logger 2013-06-17 07:08:46 +0000 | |||
223 | +++ bin/pt-fk-error-logger 2013-06-25 22:36:25 +0000 | |||
224 | @@ -1100,7 +1100,7 @@ | |||
225 | 1100 | if ( $user_vars ) { | 1100 | if ( $user_vars ) { |
226 | 1101 | foreach my $var_val ( @$user_vars ) { | 1101 | foreach my $var_val ( @$user_vars ) { |
227 | 1102 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1102 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
229 | 1103 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1103 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
230 | 1104 | $user_vars{$var} = { | 1104 | $user_vars{$var} = { |
231 | 1105 | val => $val, | 1105 | val => $val, |
232 | 1106 | default => 0, | 1106 | default => 0, |
233 | @@ -1114,7 +1114,7 @@ | |||
234 | 1114 | %default_vars = map { | 1114 | %default_vars = map { |
235 | 1115 | my $var_val = $_; | 1115 | my $var_val = $_; |
236 | 1116 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1116 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
238 | 1117 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1117 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
239 | 1118 | $var => { | 1118 | $var => { |
240 | 1119 | val => $val, | 1119 | val => $val, |
241 | 1120 | default => 1, | 1120 | default => 1, |
242 | 1121 | 1121 | ||
243 | === modified file 'bin/pt-heartbeat' | |||
244 | --- bin/pt-heartbeat 2013-06-17 07:08:46 +0000 | |||
245 | +++ bin/pt-heartbeat 2013-06-25 22:36:25 +0000 | |||
246 | @@ -1837,7 +1837,7 @@ | |||
247 | 1837 | if ( $user_vars ) { | 1837 | if ( $user_vars ) { |
248 | 1838 | foreach my $var_val ( @$user_vars ) { | 1838 | foreach my $var_val ( @$user_vars ) { |
249 | 1839 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1839 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
251 | 1840 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1840 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
252 | 1841 | $user_vars{$var} = { | 1841 | $user_vars{$var} = { |
253 | 1842 | val => $val, | 1842 | val => $val, |
254 | 1843 | default => 0, | 1843 | default => 0, |
255 | @@ -1851,7 +1851,7 @@ | |||
256 | 1851 | %default_vars = map { | 1851 | %default_vars = map { |
257 | 1852 | my $var_val = $_; | 1852 | my $var_val = $_; |
258 | 1853 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1853 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
260 | 1854 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1854 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
261 | 1855 | $var => { | 1855 | $var => { |
262 | 1856 | val => $val, | 1856 | val => $val, |
263 | 1857 | default => 1, | 1857 | default => 1, |
264 | 1858 | 1858 | ||
265 | === modified file 'bin/pt-index-usage' | |||
266 | --- bin/pt-index-usage 2013-06-17 07:08:46 +0000 | |||
267 | +++ bin/pt-index-usage 2013-06-25 22:36:25 +0000 | |||
268 | @@ -1682,7 +1682,7 @@ | |||
269 | 1682 | if ( $user_vars ) { | 1682 | if ( $user_vars ) { |
270 | 1683 | foreach my $var_val ( @$user_vars ) { | 1683 | foreach my $var_val ( @$user_vars ) { |
271 | 1684 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1684 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
273 | 1685 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1685 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
274 | 1686 | $user_vars{$var} = { | 1686 | $user_vars{$var} = { |
275 | 1687 | val => $val, | 1687 | val => $val, |
276 | 1688 | default => 0, | 1688 | default => 0, |
277 | @@ -1696,7 +1696,7 @@ | |||
278 | 1696 | %default_vars = map { | 1696 | %default_vars = map { |
279 | 1697 | my $var_val = $_; | 1697 | my $var_val = $_; |
280 | 1698 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1698 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
282 | 1699 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1699 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
283 | 1700 | $var => { | 1700 | $var => { |
284 | 1701 | val => $val, | 1701 | val => $val, |
285 | 1702 | default => 1, | 1702 | default => 1, |
286 | 1703 | 1703 | ||
287 | === modified file 'bin/pt-kill' | |||
288 | --- bin/pt-kill 2013-06-17 07:08:46 +0000 | |||
289 | +++ bin/pt-kill 2013-06-25 22:36:25 +0000 | |||
290 | @@ -1110,7 +1110,7 @@ | |||
291 | 1110 | if ( $user_vars ) { | 1110 | if ( $user_vars ) { |
292 | 1111 | foreach my $var_val ( @$user_vars ) { | 1111 | foreach my $var_val ( @$user_vars ) { |
293 | 1112 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1112 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
295 | 1113 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1113 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
296 | 1114 | $user_vars{$var} = { | 1114 | $user_vars{$var} = { |
297 | 1115 | val => $val, | 1115 | val => $val, |
298 | 1116 | default => 0, | 1116 | default => 0, |
299 | @@ -1124,7 +1124,7 @@ | |||
300 | 1124 | %default_vars = map { | 1124 | %default_vars = map { |
301 | 1125 | my $var_val = $_; | 1125 | my $var_val = $_; |
302 | 1126 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1126 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
304 | 1127 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1127 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
305 | 1128 | $var => { | 1128 | $var => { |
306 | 1129 | val => $val, | 1129 | val => $val, |
307 | 1130 | default => 1, | 1130 | default => 1, |
308 | 1131 | 1131 | ||
309 | === modified file 'bin/pt-online-schema-change' | |||
310 | --- bin/pt-online-schema-change 2013-06-25 19:52:03 +0000 | |||
311 | +++ bin/pt-online-schema-change 2013-06-25 22:36:25 +0000 | |||
312 | @@ -1117,7 +1117,7 @@ | |||
313 | 1117 | if ( $user_vars ) { | 1117 | if ( $user_vars ) { |
314 | 1118 | foreach my $var_val ( @$user_vars ) { | 1118 | foreach my $var_val ( @$user_vars ) { |
315 | 1119 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1119 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
317 | 1120 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1120 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
318 | 1121 | $user_vars{$var} = { | 1121 | $user_vars{$var} = { |
319 | 1122 | val => $val, | 1122 | val => $val, |
320 | 1123 | default => 0, | 1123 | default => 0, |
321 | @@ -1131,7 +1131,7 @@ | |||
322 | 1131 | %default_vars = map { | 1131 | %default_vars = map { |
323 | 1132 | my $var_val = $_; | 1132 | my $var_val = $_; |
324 | 1133 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1133 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
326 | 1134 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1134 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
327 | 1135 | $var => { | 1135 | $var => { |
328 | 1136 | val => $val, | 1136 | val => $val, |
329 | 1137 | default => 1, | 1137 | default => 1, |
330 | 1138 | 1138 | ||
331 | === modified file 'bin/pt-query-digest' | |||
332 | --- bin/pt-query-digest 2013-06-17 07:08:46 +0000 | |||
333 | +++ bin/pt-query-digest 2013-06-25 22:36:25 +0000 | |||
334 | @@ -2350,7 +2350,7 @@ | |||
335 | 2350 | if ( $user_vars ) { | 2350 | if ( $user_vars ) { |
336 | 2351 | foreach my $var_val ( @$user_vars ) { | 2351 | foreach my $var_val ( @$user_vars ) { |
337 | 2352 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2352 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
339 | 2353 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2353 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
340 | 2354 | $user_vars{$var} = { | 2354 | $user_vars{$var} = { |
341 | 2355 | val => $val, | 2355 | val => $val, |
342 | 2356 | default => 0, | 2356 | default => 0, |
343 | @@ -2364,7 +2364,7 @@ | |||
344 | 2364 | %default_vars = map { | 2364 | %default_vars = map { |
345 | 2365 | my $var_val = $_; | 2365 | my $var_val = $_; |
346 | 2366 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2366 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
348 | 2367 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2367 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
349 | 2368 | $var => { | 2368 | $var => { |
350 | 2369 | val => $val, | 2369 | val => $val, |
351 | 2370 | default => 1, | 2370 | default => 1, |
352 | 2371 | 2371 | ||
353 | === modified file 'bin/pt-show-grants' | |||
354 | --- bin/pt-show-grants 2013-06-17 07:08:46 +0000 | |||
355 | +++ bin/pt-show-grants 2013-06-25 22:36:25 +0000 | |||
356 | @@ -1030,7 +1030,7 @@ | |||
357 | 1030 | if ( $user_vars ) { | 1030 | if ( $user_vars ) { |
358 | 1031 | foreach my $var_val ( @$user_vars ) { | 1031 | foreach my $var_val ( @$user_vars ) { |
359 | 1032 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1032 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
361 | 1033 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1033 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
362 | 1034 | $user_vars{$var} = { | 1034 | $user_vars{$var} = { |
363 | 1035 | val => $val, | 1035 | val => $val, |
364 | 1036 | default => 0, | 1036 | default => 0, |
365 | @@ -1044,7 +1044,7 @@ | |||
366 | 1044 | %default_vars = map { | 1044 | %default_vars = map { |
367 | 1045 | my $var_val = $_; | 1045 | my $var_val = $_; |
368 | 1046 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1046 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
370 | 1047 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1047 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
371 | 1048 | $var => { | 1048 | $var => { |
372 | 1049 | val => $val, | 1049 | val => $val, |
373 | 1050 | default => 1, | 1050 | default => 1, |
374 | 1051 | 1051 | ||
375 | === modified file 'bin/pt-slave-delay' | |||
376 | --- bin/pt-slave-delay 2013-06-17 07:08:46 +0000 | |||
377 | +++ bin/pt-slave-delay 2013-06-25 22:36:25 +0000 | |||
378 | @@ -1103,7 +1103,7 @@ | |||
379 | 1103 | if ( $user_vars ) { | 1103 | if ( $user_vars ) { |
380 | 1104 | foreach my $var_val ( @$user_vars ) { | 1104 | foreach my $var_val ( @$user_vars ) { |
381 | 1105 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1105 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
383 | 1106 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1106 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
384 | 1107 | $user_vars{$var} = { | 1107 | $user_vars{$var} = { |
385 | 1108 | val => $val, | 1108 | val => $val, |
386 | 1109 | default => 0, | 1109 | default => 0, |
387 | @@ -1117,7 +1117,7 @@ | |||
388 | 1117 | %default_vars = map { | 1117 | %default_vars = map { |
389 | 1118 | my $var_val = $_; | 1118 | my $var_val = $_; |
390 | 1119 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1119 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
392 | 1120 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1120 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
393 | 1121 | $var => { | 1121 | $var => { |
394 | 1122 | val => $val, | 1122 | val => $val, |
395 | 1123 | default => 1, | 1123 | default => 1, |
396 | 1124 | 1124 | ||
397 | === modified file 'bin/pt-slave-find' | |||
398 | --- bin/pt-slave-find 2013-06-17 07:08:46 +0000 | |||
399 | +++ bin/pt-slave-find 2013-06-25 22:36:25 +0000 | |||
400 | @@ -1038,7 +1038,7 @@ | |||
401 | 1038 | if ( $user_vars ) { | 1038 | if ( $user_vars ) { |
402 | 1039 | foreach my $var_val ( @$user_vars ) { | 1039 | foreach my $var_val ( @$user_vars ) { |
403 | 1040 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1040 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
405 | 1041 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1041 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
406 | 1042 | $user_vars{$var} = { | 1042 | $user_vars{$var} = { |
407 | 1043 | val => $val, | 1043 | val => $val, |
408 | 1044 | default => 0, | 1044 | default => 0, |
409 | @@ -1052,7 +1052,7 @@ | |||
410 | 1052 | %default_vars = map { | 1052 | %default_vars = map { |
411 | 1053 | my $var_val = $_; | 1053 | my $var_val = $_; |
412 | 1054 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1054 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
414 | 1055 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1055 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
415 | 1056 | $var => { | 1056 | $var => { |
416 | 1057 | val => $val, | 1057 | val => $val, |
417 | 1058 | default => 1, | 1058 | default => 1, |
418 | 1059 | 1059 | ||
419 | === modified file 'bin/pt-slave-restart' | |||
420 | --- bin/pt-slave-restart 2013-06-17 07:08:46 +0000 | |||
421 | +++ bin/pt-slave-restart 2013-06-25 22:36:25 +0000 | |||
422 | @@ -1255,7 +1255,7 @@ | |||
423 | 1255 | if ( $user_vars ) { | 1255 | if ( $user_vars ) { |
424 | 1256 | foreach my $var_val ( @$user_vars ) { | 1256 | foreach my $var_val ( @$user_vars ) { |
425 | 1257 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1257 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
427 | 1258 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1258 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
428 | 1259 | $user_vars{$var} = { | 1259 | $user_vars{$var} = { |
429 | 1260 | val => $val, | 1260 | val => $val, |
430 | 1261 | default => 0, | 1261 | default => 0, |
431 | @@ -1269,7 +1269,7 @@ | |||
432 | 1269 | %default_vars = map { | 1269 | %default_vars = map { |
433 | 1270 | my $var_val = $_; | 1270 | my $var_val = $_; |
434 | 1271 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1271 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
436 | 1272 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1272 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
437 | 1273 | $var => { | 1273 | $var => { |
438 | 1274 | val => $val, | 1274 | val => $val, |
439 | 1275 | default => 1, | 1275 | default => 1, |
440 | 1276 | 1276 | ||
441 | === modified file 'bin/pt-table-checksum' | |||
442 | --- bin/pt-table-checksum 2013-06-17 07:08:46 +0000 | |||
443 | +++ bin/pt-table-checksum 2013-06-25 22:36:25 +0000 | |||
444 | @@ -2784,7 +2784,7 @@ | |||
445 | 2784 | if ( $user_vars ) { | 2784 | if ( $user_vars ) { |
446 | 2785 | foreach my $var_val ( @$user_vars ) { | 2785 | foreach my $var_val ( @$user_vars ) { |
447 | 2786 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2786 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
449 | 2787 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2787 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
450 | 2788 | $user_vars{$var} = { | 2788 | $user_vars{$var} = { |
451 | 2789 | val => $val, | 2789 | val => $val, |
452 | 2790 | default => 0, | 2790 | default => 0, |
453 | @@ -2798,7 +2798,7 @@ | |||
454 | 2798 | %default_vars = map { | 2798 | %default_vars = map { |
455 | 2799 | my $var_val = $_; | 2799 | my $var_val = $_; |
456 | 2800 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2800 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
458 | 2801 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2801 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
459 | 2802 | $var => { | 2802 | $var => { |
460 | 2803 | val => $val, | 2803 | val => $val, |
461 | 2804 | default => 1, | 2804 | default => 1, |
462 | 2805 | 2805 | ||
463 | === modified file 'bin/pt-table-sync' | |||
464 | --- bin/pt-table-sync 2013-06-17 07:08:46 +0000 | |||
465 | +++ bin/pt-table-sync 2013-06-25 22:36:25 +0000 | |||
466 | @@ -1118,7 +1118,7 @@ | |||
467 | 1118 | if ( $user_vars ) { | 1118 | if ( $user_vars ) { |
468 | 1119 | foreach my $var_val ( @$user_vars ) { | 1119 | foreach my $var_val ( @$user_vars ) { |
469 | 1120 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1120 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
471 | 1121 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1121 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
472 | 1122 | $user_vars{$var} = { | 1122 | $user_vars{$var} = { |
473 | 1123 | val => $val, | 1123 | val => $val, |
474 | 1124 | default => 0, | 1124 | default => 0, |
475 | @@ -1132,7 +1132,7 @@ | |||
476 | 1132 | %default_vars = map { | 1132 | %default_vars = map { |
477 | 1133 | my $var_val = $_; | 1133 | my $var_val = $_; |
478 | 1134 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1134 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
480 | 1135 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1135 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
481 | 1136 | $var => { | 1136 | $var => { |
482 | 1137 | val => $val, | 1137 | val => $val, |
483 | 1138 | default => 1, | 1138 | default => 1, |
484 | 1139 | 1139 | ||
485 | === modified file 'bin/pt-table-usage' | |||
486 | --- bin/pt-table-usage 2013-06-17 07:08:46 +0000 | |||
487 | +++ bin/pt-table-usage 2013-06-25 22:36:25 +0000 | |||
488 | @@ -1467,7 +1467,7 @@ | |||
489 | 1467 | if ( $user_vars ) { | 1467 | if ( $user_vars ) { |
490 | 1468 | foreach my $var_val ( @$user_vars ) { | 1468 | foreach my $var_val ( @$user_vars ) { |
491 | 1469 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1469 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
493 | 1470 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1470 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
494 | 1471 | $user_vars{$var} = { | 1471 | $user_vars{$var} = { |
495 | 1472 | val => $val, | 1472 | val => $val, |
496 | 1473 | default => 0, | 1473 | default => 0, |
497 | @@ -1481,7 +1481,7 @@ | |||
498 | 1481 | %default_vars = map { | 1481 | %default_vars = map { |
499 | 1482 | my $var_val = $_; | 1482 | my $var_val = $_; |
500 | 1483 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1483 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
502 | 1484 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1484 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
503 | 1485 | $var => { | 1485 | $var => { |
504 | 1486 | val => $val, | 1486 | val => $val, |
505 | 1487 | default => 1, | 1487 | default => 1, |
506 | 1488 | 1488 | ||
507 | === modified file 'bin/pt-upgrade' | |||
508 | --- bin/pt-upgrade 2013-06-17 07:08:46 +0000 | |||
509 | +++ bin/pt-upgrade 2013-06-25 22:36:25 +0000 | |||
510 | @@ -2347,7 +2347,7 @@ | |||
511 | 2347 | if ( $user_vars ) { | 2347 | if ( $user_vars ) { |
512 | 2348 | foreach my $var_val ( @$user_vars ) { | 2348 | foreach my $var_val ( @$user_vars ) { |
513 | 2349 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2349 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
515 | 2350 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2350 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
516 | 2351 | $user_vars{$var} = { | 2351 | $user_vars{$var} = { |
517 | 2352 | val => $val, | 2352 | val => $val, |
518 | 2353 | default => 0, | 2353 | default => 0, |
519 | @@ -2361,7 +2361,7 @@ | |||
520 | 2361 | %default_vars = map { | 2361 | %default_vars = map { |
521 | 2362 | my $var_val = $_; | 2362 | my $var_val = $_; |
522 | 2363 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 2363 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
524 | 2364 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 2364 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
525 | 2365 | $var => { | 2365 | $var => { |
526 | 2366 | val => $val, | 2366 | val => $val, |
527 | 2367 | default => 1, | 2367 | default => 1, |
528 | 2368 | 2368 | ||
529 | === modified file 'bin/pt-variable-advisor' | |||
530 | --- bin/pt-variable-advisor 2013-06-17 07:08:46 +0000 | |||
531 | +++ bin/pt-variable-advisor 2013-06-25 22:36:25 +0000 | |||
532 | @@ -1107,7 +1107,7 @@ | |||
533 | 1107 | if ( $user_vars ) { | 1107 | if ( $user_vars ) { |
534 | 1108 | foreach my $var_val ( @$user_vars ) { | 1108 | foreach my $var_val ( @$user_vars ) { |
535 | 1109 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1109 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
537 | 1110 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1110 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
538 | 1111 | $user_vars{$var} = { | 1111 | $user_vars{$var} = { |
539 | 1112 | val => $val, | 1112 | val => $val, |
540 | 1113 | default => 0, | 1113 | default => 0, |
541 | @@ -1121,7 +1121,7 @@ | |||
542 | 1121 | %default_vars = map { | 1121 | %default_vars = map { |
543 | 1122 | my $var_val = $_; | 1122 | my $var_val = $_; |
544 | 1123 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1123 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
546 | 1124 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1124 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
547 | 1125 | $var => { | 1125 | $var => { |
548 | 1126 | val => $val, | 1126 | val => $val, |
549 | 1127 | default => 1, | 1127 | default => 1, |
550 | 1128 | 1128 | ||
551 | === modified file 'bin/pt-visual-explain' | |||
552 | --- bin/pt-visual-explain 2013-06-17 07:08:46 +0000 | |||
553 | +++ bin/pt-visual-explain 2013-06-25 22:36:25 +0000 | |||
554 | @@ -1704,7 +1704,7 @@ | |||
555 | 1704 | if ( $user_vars ) { | 1704 | if ( $user_vars ) { |
556 | 1705 | foreach my $var_val ( @$user_vars ) { | 1705 | foreach my $var_val ( @$user_vars ) { |
557 | 1706 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1706 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
559 | 1707 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1707 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
560 | 1708 | $user_vars{$var} = { | 1708 | $user_vars{$var} = { |
561 | 1709 | val => $val, | 1709 | val => $val, |
562 | 1710 | default => 0, | 1710 | default => 0, |
563 | @@ -1718,7 +1718,7 @@ | |||
564 | 1718 | %default_vars = map { | 1718 | %default_vars = map { |
565 | 1719 | my $var_val = $_; | 1719 | my $var_val = $_; |
566 | 1720 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1720 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
568 | 1721 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1721 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
569 | 1722 | $var => { | 1722 | $var => { |
570 | 1723 | val => $val, | 1723 | val => $val, |
571 | 1724 | default => 1, | 1724 | default => 1, |
572 | 1725 | 1725 | ||
573 | === modified file 'lib/OptionParser.pm' | |||
574 | --- lib/OptionParser.pm 2013-02-28 01:47:00 +0000 | |||
575 | +++ lib/OptionParser.pm 2013-06-25 22:36:25 +0000 | |||
576 | @@ -1289,7 +1289,7 @@ | |||
577 | 1289 | if ( $user_vars ) { | 1289 | if ( $user_vars ) { |
578 | 1290 | foreach my $var_val ( @$user_vars ) { | 1290 | foreach my $var_val ( @$user_vars ) { |
579 | 1291 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1291 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
581 | 1292 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1292 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
582 | 1293 | $user_vars{$var} = { | 1293 | $user_vars{$var} = { |
583 | 1294 | val => $val, | 1294 | val => $val, |
584 | 1295 | default => 0, | 1295 | default => 0, |
585 | @@ -1303,7 +1303,7 @@ | |||
586 | 1303 | %default_vars = map { | 1303 | %default_vars = map { |
587 | 1304 | my $var_val = $_; | 1304 | my $var_val = $_; |
588 | 1305 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; | 1305 | my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; |
590 | 1306 | die "Invalid --set-vars value: $var_val\n" unless $var && $val; | 1306 | die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; |
591 | 1307 | $var => { | 1307 | $var => { |
592 | 1308 | val => $val, | 1308 | val => $val, |
593 | 1309 | default => 1, | 1309 | default => 1, |
594 | 1310 | 1310 | ||
595 | === modified file 't/lib/OptionParser.t' | |||
596 | --- t/lib/OptionParser.t 2013-03-13 18:38:45 +0000 | |||
597 | +++ t/lib/OptionParser.t 2013-06-25 22:36:25 +0000 | |||
598 | @@ -2021,6 +2021,48 @@ | |||
599 | 2021 | "Non-zero exit status on error parsing options (bug 1039074)" | 2021 | "Non-zero exit status on error parsing options (bug 1039074)" |
600 | 2022 | ); | 2022 | ); |
601 | 2023 | 2023 | ||
602 | 2024 | |||
603 | 2025 | # ############################################################################# | ||
604 | 2026 | # --set-vars/set_vars() | ||
605 | 2027 | # ############################################################################# | ||
606 | 2028 | |||
607 | 2029 | @ARGV = qw(); | ||
608 | 2030 | $o = new OptionParser(file => "$trunk/bin/pt-archiver"); | ||
609 | 2031 | $o->get_specs(); | ||
610 | 2032 | $o->get_opts(); | ||
611 | 2033 | |||
612 | 2034 | my $vars = $o->set_vars("$trunk/bin/pt-archiver"); | ||
613 | 2035 | is_deeply( | ||
614 | 2036 | $vars, | ||
615 | 2037 | { | ||
616 | 2038 | wait_timeout => { | ||
617 | 2039 | default => 1, | ||
618 | 2040 | val => '10000', | ||
619 | 2041 | }, | ||
620 | 2042 | }, | ||
621 | 2043 | "set_vars(): 1 default from docs" | ||
622 | 2044 | ) or diag(Dumper($vars)); | ||
623 | 2045 | |||
624 | 2046 | # Bug 1182856: Zero values causes "Invalid --set-vars value: var=0" | ||
625 | 2047 | @ARGV = qw(--set-vars SQL_LOG_BIN=0); | ||
626 | 2048 | $o->get_opts(); | ||
627 | 2049 | |||
628 | 2050 | $vars = $o->set_vars("$trunk/bin/pt-archiver"); | ||
629 | 2051 | is_deeply( | ||
630 | 2052 | $vars, | ||
631 | 2053 | { | ||
632 | 2054 | wait_timeout => { | ||
633 | 2055 | default => 1, | ||
634 | 2056 | val => '10000', | ||
635 | 2057 | }, | ||
636 | 2058 | SQL_LOG_BIN => { | ||
637 | 2059 | default => 0, | ||
638 | 2060 | val => '0', | ||
639 | 2061 | }, | ||
640 | 2062 | }, | ||
641 | 2063 | "set_vars(): var=0 (bug 1182856)" | ||
642 | 2064 | ) or diag(Dumper($vars)); | ||
643 | 2065 | |||
644 | 2024 | # ############################################################################# | 2066 | # ############################################################################# |
645 | 2025 | # Done. | 2067 | # Done. |
646 | 2026 | # ############################################################################# | 2068 | # ############################################################################# |