Merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.11 into lp:percona-toolkit/2.2
- release-2.2.11
- Merge into 2.2
Proposed by
Tomislav Plavcic
Status: | Merged |
---|---|
Merged at revision: | 610 |
Proposed branch: | lp:~percona-toolkit-dev/percona-toolkit/release-2.2.11 |
Merge into: | lp:percona-toolkit/2.2 |
Diff against target: |
2637 lines (+1216/-164) 72 files modified
Changelog (+10/-0) Makefile.PL (+1/-1) bin/pt-align (+1/-1) 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 (+1/-1) bin/pt-find (+2/-2) bin/pt-fingerprint (+1/-1) bin/pt-fk-error-logger (+2/-2) bin/pt-heartbeat (+2/-2) bin/pt-index-usage (+4/-2) bin/pt-ioprofile (+1/-1) bin/pt-kill (+2/-2) bin/pt-mext (+1/-1) bin/pt-mysql-summary (+14/-21) bin/pt-online-schema-change (+2/-2) bin/pt-pmp (+1/-1) bin/pt-query-digest (+4/-2) bin/pt-show-grants (+1/-1) bin/pt-sift (+1/-1) bin/pt-slave-delay (+2/-2) bin/pt-slave-find (+1/-1) bin/pt-slave-restart (+2/-2) bin/pt-stalk (+20/-6) bin/pt-summary (+2/-2) bin/pt-table-checksum (+2/-2) bin/pt-table-sync (+2/-2) bin/pt-table-usage (+3/-1) bin/pt-upgrade (+4/-2) bin/pt-variable-advisor (+5/-5) bin/pt-visual-explain (+1/-1) config/deb/changelog (+12/-0) config/rpm/percona-toolkit.spec (+1/-1) config/sphinx-build/conf.py (+1/-1) docs/percona-toolkit.pod (+1/-1) docs/release_notes.rst (+28/-0) lib/Percona/Toolkit.pm (+1/-1) lib/Sandbox.pm (+4/-0) lib/SlowLogParser.pm (+2/-0) lib/VariableAdvisorRules.pm (+2/-2) lib/bash/report_mysql_info.sh (+15/-24) lib/bash/report_system_info.sh (+1/-1) sandbox/start-sandbox (+1/-1) t/lib/Percona/Toolkit.t (+16/-0) t/lib/SlowLogParser.t (+20/-20) t/lib/VariableAdvisorRules.t (+5/-5) t/lib/bash/report_mysql_info.sh (+1/-0) t/lib/bash/report_system_info.sh (+11/-1) t/pt-duplicate-key-checker/standard_options.t (+26/-1) t/pt-fifo-split/pt-fifo-split.t (+6/-0) t/pt-mysql-summary/samples/my.cnf-001.txt (+2/-0) t/pt-query-digest/samples/slow008_report.txt (+3/-3) t/pt-query-digest/samples/slow011_report.txt (+2/-2) t/pt-query-digest/samples/slow013_report.txt (+4/-4) t/pt-query-digest/samples/slow013_report_fingerprint_user.txt (+2/-2) t/pt-query-digest/samples/slow013_report_limit.txt (+1/-1) t/pt-query-digest/samples/slow013_report_outliers.txt (+2/-2) t/pt-query-digest/samples/slow013_report_user.txt (+2/-2) t/pt-query-digest/samples/slow019_report.txt (+2/-2) t/pt-query-digest/samples/slow055.txt (+1/-1) t/pt-query-digest/samples/slow056.txt (+2/-2) t/pt-query-digest/samples/slow057.txt (+1/-1) t/pt-query-digest/samples/slow058.txt (+3/-3) t/pt-summary/samples/dmidecode-006.txt (+920/-0) t/pt-variable-advisor/samples/vars001-ignore-rules.txt (+2/-0) t/pt-variable-advisor/samples/vars001-verbose-verbose.txt (+2/-0) t/pt-variable-advisor/samples/vars001-verbose.txt (+2/-0) t/pt-variable-advisor/samples/vars001.txt (+2/-0) t/pt-variable-advisor/samples/vars002.txt (+2/-0) |
To merge this branch: | bzr merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.11 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Nichter | Approve | ||
Review via email: mp+236415@code.launchpad.net |
Commit message
Description of the change
Release branch for version 2.2.11
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Changelog' | |||
2 | --- Changelog 2014-08-06 19:55:47 +0000 | |||
3 | +++ Changelog 2014-09-29 19:43:03 +0000 | |||
4 | @@ -1,5 +1,15 @@ | |||
5 | 1 | Changelog for Percona Toolkit | 1 | Changelog for Percona Toolkit |
6 | 2 | 2 | ||
7 | 3 | v2.2.11 released 2014-09-26 | ||
8 | 4 | |||
9 | 5 | * Fixed bug 1262456: pt-query-digest doesn't report host details | ||
10 | 6 | * Fixed bug 1264580: pt-mysql-summary incorrectly tries to parse key/value pairs in wsrep_provider_options resulting in incomplete my.cnf information | ||
11 | 7 | * Fixed bug 1318985: pt-stalk should use SQL_NO_CACHE | ||
12 | 8 | * Fixed bug 1348679: pt-stalk handles mysql user password in awkward way | ||
13 | 9 | * Fixed bug 1365085: Various issues with tests | ||
14 | 10 | * Fixed bug 1368379: pt-summary problem parsing dmidecode output on some machines | ||
15 | 11 | * Fixed bug 1303388: Typo in pt-variable-advisor | ||
16 | 12 | |||
17 | 3 | v2.2.10 released 2014-08-06 | 13 | v2.2.10 released 2014-08-06 |
18 | 4 | 14 | ||
19 | 5 | * Fixed bug 1287253: pt-table-checksum deadlock | 15 | * Fixed bug 1287253: pt-table-checksum deadlock |
20 | 6 | 16 | ||
21 | === modified file 'Makefile.PL' | |||
22 | --- Makefile.PL 2014-08-06 19:55:47 +0000 | |||
23 | +++ Makefile.PL 2014-09-29 19:43:03 +0000 | |||
24 | @@ -2,7 +2,7 @@ | |||
25 | 2 | 2 | ||
26 | 3 | WriteMakefile( | 3 | WriteMakefile( |
27 | 4 | NAME => 'percona-toolkit', | 4 | NAME => 'percona-toolkit', |
29 | 5 | VERSION => '2.2.10', | 5 | VERSION => '2.2.11', |
30 | 6 | EXE_FILES => [ <bin/*> ], | 6 | EXE_FILES => [ <bin/*> ], |
31 | 7 | MAN1PODS => { | 7 | MAN1PODS => { |
32 | 8 | 'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p', | 8 | 'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p', |
33 | 9 | 9 | ||
34 | === modified file 'bin/pt-align' | |||
35 | --- bin/pt-align 2014-08-05 20:37:42 +0000 | |||
36 | +++ bin/pt-align 2014-09-29 19:43:03 +0000 | |||
37 | @@ -1323,6 +1323,6 @@ | |||
38 | 1323 | 1323 | ||
39 | 1324 | =head1 VERSION | 1324 | =head1 VERSION |
40 | 1325 | 1325 | ||
42 | 1326 | pt-align 2.2.10 | 1326 | pt-align 2.2.11 |
43 | 1327 | 1327 | ||
44 | 1328 | =cut | 1328 | =cut |
45 | 1329 | 1329 | ||
46 | === modified file 'bin/pt-archiver' | |||
47 | --- bin/pt-archiver 2014-08-05 20:37:42 +0000 | |||
48 | +++ bin/pt-archiver 2014-09-29 19:43:03 +0000 | |||
49 | @@ -43,7 +43,7 @@ | |||
50 | 43 | { | 43 | { |
51 | 44 | package Percona::Toolkit; | 44 | package Percona::Toolkit; |
52 | 45 | 45 | ||
54 | 46 | our $VERSION = '2.2.10'; | 46 | our $VERSION = '2.2.11'; |
55 | 47 | 47 | ||
56 | 48 | use strict; | 48 | use strict; |
57 | 49 | use warnings FATAL => 'all'; | 49 | use warnings FATAL => 'all'; |
58 | @@ -7892,6 +7892,6 @@ | |||
59 | 7892 | 7892 | ||
60 | 7893 | =head1 VERSION | 7893 | =head1 VERSION |
61 | 7894 | 7894 | ||
63 | 7895 | pt-archiver 2.2.10 | 7895 | pt-archiver 2.2.11 |
64 | 7896 | 7896 | ||
65 | 7897 | =cut | 7897 | =cut |
66 | 7898 | 7898 | ||
67 | === modified file 'bin/pt-config-diff' | |||
68 | --- bin/pt-config-diff 2014-08-05 20:37:42 +0000 | |||
69 | +++ bin/pt-config-diff 2014-09-29 19:43:03 +0000 | |||
70 | @@ -43,7 +43,7 @@ | |||
71 | 43 | { | 43 | { |
72 | 44 | package Percona::Toolkit; | 44 | package Percona::Toolkit; |
73 | 45 | 45 | ||
75 | 46 | our $VERSION = '2.2.10'; | 46 | our $VERSION = '2.2.11'; |
76 | 47 | 47 | ||
77 | 48 | use strict; | 48 | use strict; |
78 | 49 | use warnings FATAL => 'all'; | 49 | use warnings FATAL => 'all'; |
79 | @@ -5733,6 +5733,6 @@ | |||
80 | 5733 | 5733 | ||
81 | 5734 | =head1 VERSION | 5734 | =head1 VERSION |
82 | 5735 | 5735 | ||
84 | 5736 | pt-config-diff 2.2.10 | 5736 | pt-config-diff 2.2.11 |
85 | 5737 | 5737 | ||
86 | 5738 | =cut | 5738 | =cut |
87 | 5739 | 5739 | ||
88 | === modified file 'bin/pt-deadlock-logger' | |||
89 | --- bin/pt-deadlock-logger 2014-08-05 20:37:42 +0000 | |||
90 | +++ bin/pt-deadlock-logger 2014-09-29 19:43:03 +0000 | |||
91 | @@ -42,7 +42,7 @@ | |||
92 | 42 | { | 42 | { |
93 | 43 | package Percona::Toolkit; | 43 | package Percona::Toolkit; |
94 | 44 | 44 | ||
96 | 45 | our $VERSION = '2.2.10'; | 45 | our $VERSION = '2.2.11'; |
97 | 46 | 46 | ||
98 | 47 | use strict; | 47 | use strict; |
99 | 48 | use warnings FATAL => 'all'; | 48 | use warnings FATAL => 'all'; |
100 | @@ -5523,6 +5523,6 @@ | |||
101 | 5523 | 5523 | ||
102 | 5524 | =head1 VERSION | 5524 | =head1 VERSION |
103 | 5525 | 5525 | ||
105 | 5526 | pt-deadlock-logger 2.2.10 | 5526 | pt-deadlock-logger 2.2.11 |
106 | 5527 | 5527 | ||
107 | 5528 | =cut | 5528 | =cut |
108 | 5529 | 5529 | ||
109 | === modified file 'bin/pt-diskstats' | |||
110 | --- bin/pt-diskstats 2014-08-05 20:37:42 +0000 | |||
111 | +++ bin/pt-diskstats 2014-09-29 19:43:03 +0000 | |||
112 | @@ -38,7 +38,7 @@ | |||
113 | 38 | { | 38 | { |
114 | 39 | package Percona::Toolkit; | 39 | package Percona::Toolkit; |
115 | 40 | 40 | ||
117 | 41 | our $VERSION = '2.2.10'; | 41 | our $VERSION = '2.2.11'; |
118 | 42 | 42 | ||
119 | 43 | use strict; | 43 | use strict; |
120 | 44 | use warnings FATAL => 'all'; | 44 | use warnings FATAL => 'all'; |
121 | @@ -5579,6 +5579,6 @@ | |||
122 | 5579 | 5579 | ||
123 | 5580 | =head1 VERSION | 5580 | =head1 VERSION |
124 | 5581 | 5581 | ||
126 | 5582 | pt-diskstats 2.2.10 | 5582 | pt-diskstats 2.2.11 |
127 | 5583 | 5583 | ||
128 | 5584 | =cut | 5584 | =cut |
129 | 5585 | 5585 | ||
130 | === modified file 'bin/pt-duplicate-key-checker' | |||
131 | --- bin/pt-duplicate-key-checker 2014-08-05 20:37:42 +0000 | |||
132 | +++ bin/pt-duplicate-key-checker 2014-09-29 19:43:03 +0000 | |||
133 | @@ -39,7 +39,7 @@ | |||
134 | 39 | { | 39 | { |
135 | 40 | package Percona::Toolkit; | 40 | package Percona::Toolkit; |
136 | 41 | 41 | ||
138 | 42 | our $VERSION = '2.2.10'; | 42 | our $VERSION = '2.2.11'; |
139 | 43 | 43 | ||
140 | 44 | use strict; | 44 | use strict; |
141 | 45 | use warnings FATAL => 'all'; | 45 | use warnings FATAL => 'all'; |
142 | @@ -5600,6 +5600,6 @@ | |||
143 | 5600 | 5600 | ||
144 | 5601 | =head1 VERSION | 5601 | =head1 VERSION |
145 | 5602 | 5602 | ||
147 | 5603 | pt-duplicate-key-checker 2.2.10 | 5603 | pt-duplicate-key-checker 2.2.11 |
148 | 5604 | 5604 | ||
149 | 5605 | =cut | 5605 | =cut |
150 | 5606 | 5606 | ||
151 | === modified file 'bin/pt-fifo-split' | |||
152 | --- bin/pt-fifo-split 2014-08-05 20:37:42 +0000 | |||
153 | +++ bin/pt-fifo-split 2014-09-29 19:43:03 +0000 | |||
154 | @@ -1612,6 +1612,6 @@ | |||
155 | 1612 | 1612 | ||
156 | 1613 | =head1 VERSION | 1613 | =head1 VERSION |
157 | 1614 | 1614 | ||
159 | 1615 | pt-fifo-split 2.2.10 | 1615 | pt-fifo-split 2.2.11 |
160 | 1616 | 1616 | ||
161 | 1617 | =cut | 1617 | =cut |
162 | 1618 | 1618 | ||
163 | === modified file 'bin/pt-find' | |||
164 | --- bin/pt-find 2014-08-05 20:37:42 +0000 | |||
165 | +++ bin/pt-find 2014-09-29 19:43:03 +0000 | |||
166 | @@ -35,7 +35,7 @@ | |||
167 | 35 | { | 35 | { |
168 | 36 | package Percona::Toolkit; | 36 | package Percona::Toolkit; |
169 | 37 | 37 | ||
171 | 38 | our $VERSION = '2.2.10'; | 38 | our $VERSION = '2.2.11'; |
172 | 39 | 39 | ||
173 | 40 | use strict; | 40 | use strict; |
174 | 41 | use warnings FATAL => 'all'; | 41 | use warnings FATAL => 'all'; |
175 | @@ -4984,6 +4984,6 @@ | |||
176 | 4984 | 4984 | ||
177 | 4985 | =head1 VERSION | 4985 | =head1 VERSION |
178 | 4986 | 4986 | ||
180 | 4987 | pt-find 2.2.10 | 4987 | pt-find 2.2.11 |
181 | 4988 | 4988 | ||
182 | 4989 | =cut | 4989 | =cut |
183 | 4990 | 4990 | ||
184 | === modified file 'bin/pt-fingerprint' | |||
185 | --- bin/pt-fingerprint 2014-08-05 20:37:42 +0000 | |||
186 | +++ bin/pt-fingerprint 2014-09-29 19:43:03 +0000 | |||
187 | @@ -2203,6 +2203,6 @@ | |||
188 | 2203 | 2203 | ||
189 | 2204 | =head1 VERSION | 2204 | =head1 VERSION |
190 | 2205 | 2205 | ||
192 | 2206 | pt-fingerprint 2.2.10 | 2206 | pt-fingerprint 2.2.11 |
193 | 2207 | 2207 | ||
194 | 2208 | =cut | 2208 | =cut |
195 | 2209 | 2209 | ||
196 | === modified file 'bin/pt-fk-error-logger' | |||
197 | --- bin/pt-fk-error-logger 2014-08-05 20:37:42 +0000 | |||
198 | +++ bin/pt-fk-error-logger 2014-09-29 19:43:03 +0000 | |||
199 | @@ -37,7 +37,7 @@ | |||
200 | 37 | { | 37 | { |
201 | 38 | package Percona::Toolkit; | 38 | package Percona::Toolkit; |
202 | 39 | 39 | ||
204 | 40 | our $VERSION = '2.2.10'; | 40 | our $VERSION = '2.2.11'; |
205 | 41 | 41 | ||
206 | 42 | use strict; | 42 | use strict; |
207 | 43 | use warnings FATAL => 'all'; | 43 | use warnings FATAL => 'all'; |
208 | @@ -4509,6 +4509,6 @@ | |||
209 | 4509 | 4509 | ||
210 | 4510 | =head1 VERSION | 4510 | =head1 VERSION |
211 | 4511 | 4511 | ||
213 | 4512 | pt-fk-error-logger 2.2.10 | 4512 | pt-fk-error-logger 2.2.11 |
214 | 4513 | 4513 | ||
215 | 4514 | =cut | 4514 | =cut |
216 | 4515 | 4515 | ||
217 | === modified file 'bin/pt-heartbeat' | |||
218 | --- bin/pt-heartbeat 2014-08-05 20:37:42 +0000 | |||
219 | +++ bin/pt-heartbeat 2014-09-29 19:43:03 +0000 | |||
220 | @@ -38,7 +38,7 @@ | |||
221 | 38 | { | 38 | { |
222 | 39 | package Percona::Toolkit; | 39 | package Percona::Toolkit; |
223 | 40 | 40 | ||
225 | 41 | our $VERSION = '2.2.10'; | 41 | our $VERSION = '2.2.11'; |
226 | 42 | 42 | ||
227 | 43 | use strict; | 43 | use strict; |
228 | 44 | use warnings FATAL => 'all'; | 44 | use warnings FATAL => 'all'; |
229 | @@ -6192,6 +6192,6 @@ | |||
230 | 6192 | 6192 | ||
231 | 6193 | =head1 VERSION | 6193 | =head1 VERSION |
232 | 6194 | 6194 | ||
234 | 6195 | pt-heartbeat 2.2.10 | 6195 | pt-heartbeat 2.2.11 |
235 | 6196 | 6196 | ||
236 | 6197 | =cut | 6197 | =cut |
237 | 6198 | 6198 | ||
238 | === modified file 'bin/pt-index-usage' | |||
239 | --- bin/pt-index-usage 2014-08-05 20:37:42 +0000 | |||
240 | +++ bin/pt-index-usage 2014-09-29 19:43:03 +0000 | |||
241 | @@ -45,7 +45,7 @@ | |||
242 | 45 | { | 45 | { |
243 | 46 | package Percona::Toolkit; | 46 | package Percona::Toolkit; |
244 | 47 | 47 | ||
246 | 48 | our $VERSION = '2.2.10'; | 48 | our $VERSION = '2.2.11'; |
247 | 49 | 49 | ||
248 | 50 | use strict; | 50 | use strict; |
249 | 51 | use warnings FATAL => 'all'; | 51 | use warnings FATAL => 'all'; |
250 | @@ -2845,6 +2845,7 @@ | |||
251 | 2845 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 2845 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
252 | 2846 | ) { | 2846 | ) { |
253 | 2847 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 2847 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
254 | 2848 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
255 | 2848 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 2849 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
256 | 2849 | if ( $thread_id ) { | 2850 | if ( $thread_id ) { |
257 | 2850 | push @properties, 'Thread_id', $thread_id; | 2851 | push @properties, 'Thread_id', $thread_id; |
258 | @@ -2857,6 +2858,7 @@ | |||
259 | 2857 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 2858 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
260 | 2858 | ) { | 2859 | ) { |
261 | 2859 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 2860 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
262 | 2861 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
263 | 2860 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 2862 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
264 | 2861 | if ( $thread_id ) { | 2863 | if ( $thread_id ) { |
265 | 2862 | push @properties, 'Thread_id', $thread_id; | 2864 | push @properties, 'Thread_id', $thread_id; |
266 | @@ -7546,6 +7548,6 @@ | |||
267 | 7546 | 7548 | ||
268 | 7547 | =head1 VERSION | 7549 | =head1 VERSION |
269 | 7548 | 7550 | ||
271 | 7549 | pt-index-usage 2.2.10 | 7551 | pt-index-usage 2.2.11 |
272 | 7550 | 7552 | ||
273 | 7551 | =cut | 7553 | =cut |
274 | 7552 | 7554 | ||
275 | === modified file 'bin/pt-ioprofile' | |||
276 | --- bin/pt-ioprofile 2014-08-05 20:37:42 +0000 | |||
277 | +++ bin/pt-ioprofile 2014-09-29 19:43:03 +0000 | |||
278 | @@ -1119,7 +1119,7 @@ | |||
279 | 1119 | 1119 | ||
280 | 1120 | =head1 VERSION | 1120 | =head1 VERSION |
281 | 1121 | 1121 | ||
283 | 1122 | pt-ioprofile 2.2.10 | 1122 | pt-ioprofile 2.2.11 |
284 | 1123 | 1123 | ||
285 | 1124 | =cut | 1124 | =cut |
286 | 1125 | 1125 | ||
287 | 1126 | 1126 | ||
288 | === modified file 'bin/pt-kill' | |||
289 | --- bin/pt-kill 2014-08-05 20:37:42 +0000 | |||
290 | +++ bin/pt-kill 2014-09-29 19:43:03 +0000 | |||
291 | @@ -47,7 +47,7 @@ | |||
292 | 47 | { | 47 | { |
293 | 48 | package Percona::Toolkit; | 48 | package Percona::Toolkit; |
294 | 49 | 49 | ||
296 | 50 | our $VERSION = '2.2.10'; | 50 | our $VERSION = '2.2.11'; |
297 | 51 | 51 | ||
298 | 52 | use strict; | 52 | use strict; |
299 | 53 | use warnings FATAL => 'all'; | 53 | use warnings FATAL => 'all'; |
300 | @@ -8183,6 +8183,6 @@ | |||
301 | 8183 | 8183 | ||
302 | 8184 | =head1 VERSION | 8184 | =head1 VERSION |
303 | 8185 | 8185 | ||
305 | 8186 | pt-kill 2.2.10 | 8186 | pt-kill 2.2.11 |
306 | 8187 | 8187 | ||
307 | 8188 | =cut | 8188 | =cut |
308 | 8189 | 8189 | ||
309 | === modified file 'bin/pt-mext' | |||
310 | --- bin/pt-mext 2014-08-05 20:37:42 +0000 | |||
311 | +++ bin/pt-mext 2014-09-29 19:43:03 +0000 | |||
312 | @@ -792,7 +792,7 @@ | |||
313 | 792 | 792 | ||
314 | 793 | =head1 VERSION | 793 | =head1 VERSION |
315 | 794 | 794 | ||
317 | 795 | pt-mext 2.2.10 | 795 | pt-mext 2.2.11 |
318 | 796 | 796 | ||
319 | 797 | =cut | 797 | =cut |
320 | 798 | 798 | ||
321 | 799 | 799 | ||
322 | === modified file 'bin/pt-mysql-summary' | |||
323 | --- bin/pt-mysql-summary 2014-08-05 20:37:42 +0000 | |||
324 | +++ bin/pt-mysql-summary 2014-09-29 19:43:03 +0000 | |||
325 | @@ -1353,26 +1353,19 @@ | |||
326 | 1353 | 1353 | ||
327 | 1354 | [ -e "$file" ] || return | 1354 | [ -e "$file" ] || return |
328 | 1355 | 1355 | ||
349 | 1356 | awk ' | 1356 | perl -n -l -e ' |
350 | 1357 | BEGIN { | 1357 | my $line = $_; |
351 | 1358 | FS="=" | 1358 | if ( $line =~ /^[ \t]*[a-zA-Z[]/ ) { |
352 | 1359 | } | 1359 | if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) { |
353 | 1360 | /^[ \t]*[a-zA-Z[]/ { | 1360 | printf("%-35s = %s\n", $1, $2) |
354 | 1361 | if (length($2)) { | 1361 | } |
355 | 1362 | gsub(/^[ \t]*/, "", $1); | 1362 | elsif ( $line =~ /\s*\[/ ) { |
356 | 1363 | gsub(/^[ \t]*/, "", $2); | 1363 | print "\n$line" |
357 | 1364 | gsub(/[ \t]*$/, "", $1); | 1364 | } else { |
358 | 1365 | gsub(/[ \t]*$/, "", $2); | 1365 | print $line |
359 | 1366 | printf("%-35s = %s\n", $1, $2); | 1366 | } |
360 | 1367 | } | 1367 | }' "$file" |
361 | 1368 | else if ( $0 ~ /\[/ ) { | 1368 | |
342 | 1369 | print ""; | ||
343 | 1370 | print $1; | ||
344 | 1371 | } | ||
345 | 1372 | else { | ||
346 | 1373 | print $1; | ||
347 | 1374 | } | ||
348 | 1375 | }' "$file" | ||
362 | 1376 | } | 1369 | } |
363 | 1377 | 1370 | ||
364 | 1378 | find_checkpoint_age() { | 1371 | find_checkpoint_age() { |
365 | @@ -3090,7 +3083,7 @@ | |||
366 | 3090 | 3083 | ||
367 | 3091 | =head1 VERSION | 3084 | =head1 VERSION |
368 | 3092 | 3085 | ||
370 | 3093 | pt-mysql-summary 2.2.10 | 3086 | pt-mysql-summary 2.2.11 |
371 | 3094 | 3087 | ||
372 | 3095 | =cut | 3088 | =cut |
373 | 3096 | 3089 | ||
374 | 3097 | 3090 | ||
375 | === modified file 'bin/pt-online-schema-change' | |||
376 | --- bin/pt-online-schema-change 2014-08-05 20:37:42 +0000 | |||
377 | +++ bin/pt-online-schema-change 2014-09-29 19:43:03 +0000 | |||
378 | @@ -54,7 +54,7 @@ | |||
379 | 54 | { | 54 | { |
380 | 55 | package Percona::Toolkit; | 55 | package Percona::Toolkit; |
381 | 56 | 56 | ||
383 | 57 | our $VERSION = '2.2.10'; | 57 | our $VERSION = '2.2.11'; |
384 | 58 | 58 | ||
385 | 59 | use strict; | 59 | use strict; |
386 | 60 | use warnings FATAL => 'all'; | 60 | use warnings FATAL => 'all'; |
387 | @@ -11563,6 +11563,6 @@ | |||
388 | 11563 | 11563 | ||
389 | 11564 | =head1 VERSION | 11564 | =head1 VERSION |
390 | 11565 | 11565 | ||
392 | 11566 | pt-online-schema-change 2.2.10 | 11566 | pt-online-schema-change 2.2.11 |
393 | 11567 | 11567 | ||
394 | 11568 | =cut | 11568 | =cut |
395 | 11569 | 11569 | ||
396 | === modified file 'bin/pt-pmp' | |||
397 | --- bin/pt-pmp 2014-08-05 20:37:42 +0000 | |||
398 | +++ bin/pt-pmp 2014-09-29 19:43:03 +0000 | |||
399 | @@ -889,7 +889,7 @@ | |||
400 | 889 | 889 | ||
401 | 890 | =head1 VERSION | 890 | =head1 VERSION |
402 | 891 | 891 | ||
404 | 892 | pt-pmp 2.2.10 | 892 | pt-pmp 2.2.11 |
405 | 893 | 893 | ||
406 | 894 | =cut | 894 | =cut |
407 | 895 | 895 | ||
408 | 896 | 896 | ||
409 | === modified file 'bin/pt-query-digest' | |||
410 | --- bin/pt-query-digest 2014-08-05 20:37:42 +0000 | |||
411 | +++ bin/pt-query-digest 2014-09-29 19:43:03 +0000 | |||
412 | @@ -64,7 +64,7 @@ | |||
413 | 64 | { | 64 | { |
414 | 65 | package Percona::Toolkit; | 65 | package Percona::Toolkit; |
415 | 66 | 66 | ||
417 | 67 | our $VERSION = '2.2.10'; | 67 | our $VERSION = '2.2.11'; |
418 | 68 | 68 | ||
419 | 69 | use strict; | 69 | use strict; |
420 | 70 | use warnings FATAL => 'all'; | 70 | use warnings FATAL => 'all'; |
421 | @@ -5039,6 +5039,7 @@ | |||
422 | 5039 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 5039 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
423 | 5040 | ) { | 5040 | ) { |
424 | 5041 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 5041 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
425 | 5042 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
426 | 5042 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 5043 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
427 | 5043 | if ( $thread_id ) { | 5044 | if ( $thread_id ) { |
428 | 5044 | push @properties, 'Thread_id', $thread_id; | 5045 | push @properties, 'Thread_id', $thread_id; |
429 | @@ -5051,6 +5052,7 @@ | |||
430 | 5051 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 5052 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
431 | 5052 | ) { | 5053 | ) { |
432 | 5053 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 5054 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
433 | 5055 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
434 | 5054 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 5056 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
435 | 5055 | if ( $thread_id ) { | 5057 | if ( $thread_id ) { |
436 | 5056 | push @properties, 'Thread_id', $thread_id; | 5058 | push @properties, 'Thread_id', $thread_id; |
437 | @@ -16593,6 +16595,6 @@ | |||
438 | 16593 | 16595 | ||
439 | 16594 | =head1 VERSION | 16596 | =head1 VERSION |
440 | 16595 | 16597 | ||
442 | 16596 | pt-query-digest 2.2.10 | 16598 | pt-query-digest 2.2.11 |
443 | 16597 | 16599 | ||
444 | 16598 | =cut | 16600 | =cut |
445 | 16599 | 16601 | ||
446 | === modified file 'bin/pt-show-grants' | |||
447 | --- bin/pt-show-grants 2014-08-05 20:37:42 +0000 | |||
448 | +++ bin/pt-show-grants 2014-09-29 19:43:03 +0000 | |||
449 | @@ -2406,6 +2406,6 @@ | |||
450 | 2406 | 2406 | ||
451 | 2407 | =head1 VERSION | 2407 | =head1 VERSION |
452 | 2408 | 2408 | ||
454 | 2409 | pt-show-grants 2.2.10 | 2409 | pt-show-grants 2.2.11 |
455 | 2410 | 2410 | ||
456 | 2411 | =cut | 2411 | =cut |
457 | 2412 | 2412 | ||
458 | === modified file 'bin/pt-sift' | |||
459 | --- bin/pt-sift 2014-08-05 20:37:42 +0000 | |||
460 | +++ bin/pt-sift 2014-09-29 19:43:03 +0000 | |||
461 | @@ -1237,7 +1237,7 @@ | |||
462 | 1237 | 1237 | ||
463 | 1238 | =head1 VERSION | 1238 | =head1 VERSION |
464 | 1239 | 1239 | ||
466 | 1240 | pt-sift 2.2.10 | 1240 | pt-sift 2.2.11 |
467 | 1241 | 1241 | ||
468 | 1242 | =cut | 1242 | =cut |
469 | 1243 | 1243 | ||
470 | 1244 | 1244 | ||
471 | === modified file 'bin/pt-slave-delay' | |||
472 | --- bin/pt-slave-delay 2014-08-05 20:37:42 +0000 | |||
473 | +++ bin/pt-slave-delay 2014-09-29 19:43:03 +0000 | |||
474 | @@ -40,7 +40,7 @@ | |||
475 | 40 | { | 40 | { |
476 | 41 | package Percona::Toolkit; | 41 | package Percona::Toolkit; |
477 | 42 | 42 | ||
479 | 43 | our $VERSION = '2.2.10'; | 43 | our $VERSION = '2.2.11'; |
480 | 44 | 44 | ||
481 | 45 | use strict; | 45 | use strict; |
482 | 46 | use warnings FATAL => 'all'; | 46 | use warnings FATAL => 'all'; |
483 | @@ -4869,6 +4869,6 @@ | |||
484 | 4869 | 4869 | ||
485 | 4870 | =head1 VERSION | 4870 | =head1 VERSION |
486 | 4871 | 4871 | ||
488 | 4872 | pt-slave-delay 2.2.10 | 4872 | pt-slave-delay 2.2.11 |
489 | 4873 | 4873 | ||
490 | 4874 | =cut | 4874 | =cut |
491 | 4875 | 4875 | ||
492 | === modified file 'bin/pt-slave-find' | |||
493 | --- bin/pt-slave-find 2014-08-05 20:37:42 +0000 | |||
494 | +++ bin/pt-slave-find 2014-09-29 19:43:03 +0000 | |||
495 | @@ -4334,6 +4334,6 @@ | |||
496 | 4334 | 4334 | ||
497 | 4335 | =head1 VERSION | 4335 | =head1 VERSION |
498 | 4336 | 4336 | ||
500 | 4337 | pt-slave-find 2.2.10 | 4337 | pt-slave-find 2.2.11 |
501 | 4338 | 4338 | ||
502 | 4339 | =cut | 4339 | =cut |
503 | 4340 | 4340 | ||
504 | === modified file 'bin/pt-slave-restart' | |||
505 | --- bin/pt-slave-restart 2014-08-05 20:37:42 +0000 | |||
506 | +++ bin/pt-slave-restart 2014-09-29 19:43:03 +0000 | |||
507 | @@ -41,7 +41,7 @@ | |||
508 | 41 | { | 41 | { |
509 | 42 | package Percona::Toolkit; | 42 | package Percona::Toolkit; |
510 | 43 | 43 | ||
512 | 44 | our $VERSION = '2.2.10'; | 44 | our $VERSION = '2.2.11'; |
513 | 45 | 45 | ||
514 | 46 | use strict; | 46 | use strict; |
515 | 47 | use warnings FATAL => 'all'; | 47 | use warnings FATAL => 'all'; |
516 | @@ -5937,6 +5937,6 @@ | |||
517 | 5937 | 5937 | ||
518 | 5938 | =head1 VERSION | 5938 | =head1 VERSION |
519 | 5939 | 5939 | ||
521 | 5940 | pt-slave-restart 2.2.10 | 5940 | pt-slave-restart 2.2.11 |
522 | 5941 | 5941 | ||
523 | 5942 | =cut | 5942 | =cut |
524 | 5943 | 5943 | ||
525 | === modified file 'bin/pt-stalk' | |||
526 | --- bin/pt-stalk 2014-08-05 20:37:42 +0000 | |||
527 | +++ bin/pt-stalk 2014-09-29 19:43:03 +0000 | |||
528 | @@ -1001,7 +1001,7 @@ | |||
529 | 1001 | } | 1001 | } |
530 | 1002 | 1002 | ||
531 | 1003 | lock_waits() { | 1003 | lock_waits() { |
533 | 1004 | local sql1="SELECT | 1004 | local sql1="SELECT SQL_NO_CACHE |
534 | 1005 | CONCAT('thread ', b.trx_mysql_thread_id, ' from ', p.host) AS who_blocks, | 1005 | CONCAT('thread ', b.trx_mysql_thread_id, ' from ', p.host) AS who_blocks, |
535 | 1006 | IF(p.command = \"Sleep\", p.time, 0) AS idle_in_trx, | 1006 | IF(p.command = \"Sleep\", p.time, 0) AS idle_in_trx, |
536 | 1007 | MAX(TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP)) AS max_wait_time, | 1007 | MAX(TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP)) AS max_wait_time, |
537 | @@ -1013,7 +1013,7 @@ | |||
538 | 1013 | GROUP BY who_blocks ORDER BY num_waiters DESC\G" | 1013 | GROUP BY who_blocks ORDER BY num_waiters DESC\G" |
539 | 1014 | $CMD_MYSQL $EXT_ARGV -e "$sql1" | 1014 | $CMD_MYSQL $EXT_ARGV -e "$sql1" |
540 | 1015 | 1015 | ||
542 | 1016 | local sql2="SELECT | 1016 | local sql2="SELECT SQL_NO_CACHE |
543 | 1017 | r.trx_id AS waiting_trx_id, | 1017 | r.trx_id AS waiting_trx_id, |
544 | 1018 | r.trx_mysql_thread_id AS waiting_thread, | 1018 | r.trx_mysql_thread_id AS waiting_thread, |
545 | 1019 | TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP) AS wait_time, | 1019 | TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP) AS wait_time, |
546 | @@ -1034,9 +1034,9 @@ | |||
547 | 1034 | } | 1034 | } |
548 | 1035 | 1035 | ||
549 | 1036 | transactions() { | 1036 | transactions() { |
553 | 1037 | $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G" | 1037 | $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_TRX\G" |
554 | 1038 | $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G" | 1038 | $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G" |
555 | 1039 | $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G" | 1039 | $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G" |
556 | 1040 | } | 1040 | } |
557 | 1041 | 1041 | ||
558 | 1042 | innodb_status() { | 1042 | innodb_status() { |
559 | @@ -1447,9 +1447,19 @@ | |||
560 | 1447 | exit 0 | 1447 | exit 0 |
561 | 1448 | fi | 1448 | fi |
562 | 1449 | 1449 | ||
563 | 1450 | # if ASK-PASS , request password on terminal without echoing. This will override --password | ||
564 | 1451 | if [ -n "$OPT_ASK_PASS" ]; then | ||
565 | 1452 | stty_orig=`stty -g` # save original terminal setting. | ||
566 | 1453 | echo -n "Enter MySQL password: "; | ||
567 | 1454 | stty -echo # turn-off echoing. | ||
568 | 1455 | read OPT_PASSWORD # read the password | ||
569 | 1456 | stty $stty_orig # restore terminal setting. | ||
570 | 1457 | fi | ||
571 | 1458 | |||
572 | 1450 | MYSQL_ARGS="$(mysql_options)" | 1459 | MYSQL_ARGS="$(mysql_options)" |
573 | 1451 | EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")" | 1460 | EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")" |
574 | 1452 | 1461 | ||
575 | 1462 | |||
576 | 1453 | # Check that mysql and mysqladmin are in PATH. If not, we're | 1463 | # Check that mysql and mysqladmin are in PATH. If not, we're |
577 | 1454 | # already dead in the water, so don't bother with cmd line opts, | 1464 | # already dead in the water, so don't bother with cmd line opts, |
578 | 1455 | # just error and exit. | 1465 | # just error and exit. |
579 | @@ -1650,6 +1660,10 @@ | |||
580 | 1650 | 1660 | ||
581 | 1651 | =over | 1661 | =over |
582 | 1652 | 1662 | ||
583 | 1663 | =item --ask-pass | ||
584 | 1664 | |||
585 | 1665 | Prompt for a password when connecting to MySQL. | ||
586 | 1666 | |||
587 | 1653 | =item --collect | 1667 | =item --collect |
588 | 1654 | 1668 | ||
589 | 1655 | default: yes; negatable: yes | 1669 | default: yes; negatable: yes |
590 | @@ -2211,7 +2225,7 @@ | |||
591 | 2211 | 2225 | ||
592 | 2212 | =head1 VERSION | 2226 | =head1 VERSION |
593 | 2213 | 2227 | ||
595 | 2214 | pt-stalk 2.2.10 | 2228 | pt-stalk 2.2.11 |
596 | 2215 | 2229 | ||
597 | 2216 | =cut | 2230 | =cut |
598 | 2217 | 2231 | ||
599 | 2218 | 2232 | ||
600 | === modified file 'bin/pt-summary' | |||
601 | --- bin/pt-summary 2014-08-05 20:37:42 +0000 | |||
602 | +++ bin/pt-summary 2014-09-29 19:43:03 +0000 | |||
603 | @@ -1506,7 +1506,7 @@ | |||
604 | 1506 | -e 's/>/}/g' \ | 1506 | -e 's/>/}/g' \ |
605 | 1507 | -e 's/[ \t]*\n/\n/g' \ | 1507 | -e 's/[ \t]*\n/\n/g' \ |
606 | 1508 | "${file}" \ | 1508 | "${file}" \ |
608 | 1509 | | awk -F: '/Size|Type|Form.Factor|Type.Detail|[^ ]Locator/{printf("|%s", $2)}/Speed/{print "|" $2}' \ | 1509 | | awk -F: '/Size|Type|Form.Factor|Type.Detail|^[\t ]+Locator/{printf("|%s", $2)}/^[\t ]+Speed/{print "|" $2}' \ |
609 | 1510 | | sed -e 's/No Module Installed/{EMPTY}/' \ | 1510 | | sed -e 's/No Module Installed/{EMPTY}/' \ |
610 | 1511 | | sort \ | 1511 | | sort \ |
611 | 1512 | | awk -F'|' '{printf(" %-9s %-8s %-17s %-13s %-13s %-8s\n", $4, $2, $7, $3, $5, $6);}' | 1512 | | awk -F'|' '{printf(" %-9s %-8s %-17s %-13s %-13s %-8s\n", $4, $2, $7, $3, $5, $6);}' |
612 | @@ -2691,7 +2691,7 @@ | |||
613 | 2691 | 2691 | ||
614 | 2692 | =head1 VERSION | 2692 | =head1 VERSION |
615 | 2693 | 2693 | ||
617 | 2694 | pt-summary 2.2.10 | 2694 | pt-summary 2.2.11 |
618 | 2695 | 2695 | ||
619 | 2696 | =cut | 2696 | =cut |
620 | 2697 | 2697 | ||
621 | 2698 | 2698 | ||
622 | === modified file 'bin/pt-table-checksum' | |||
623 | --- bin/pt-table-checksum 2014-08-05 20:37:42 +0000 | |||
624 | +++ bin/pt-table-checksum 2014-09-29 19:43:03 +0000 | |||
625 | @@ -57,7 +57,7 @@ | |||
626 | 57 | { | 57 | { |
627 | 58 | package Percona::Toolkit; | 58 | package Percona::Toolkit; |
628 | 59 | 59 | ||
630 | 60 | our $VERSION = '2.2.10'; | 60 | our $VERSION = '2.2.11'; |
631 | 61 | 61 | ||
632 | 62 | use strict; | 62 | use strict; |
633 | 63 | use warnings FATAL => 'all'; | 63 | use warnings FATAL => 'all'; |
634 | @@ -12698,6 +12698,6 @@ | |||
635 | 12698 | 12698 | ||
636 | 12699 | =head1 VERSION | 12699 | =head1 VERSION |
637 | 12700 | 12700 | ||
639 | 12701 | pt-table-checksum 2.2.10 | 12701 | pt-table-checksum 2.2.11 |
640 | 12702 | 12702 | ||
641 | 12703 | =cut | 12703 | =cut |
642 | 12704 | 12704 | ||
643 | === modified file 'bin/pt-table-sync' | |||
644 | --- bin/pt-table-sync 2014-08-05 20:37:42 +0000 | |||
645 | +++ bin/pt-table-sync 2014-09-29 19:43:03 +0000 | |||
646 | @@ -55,7 +55,7 @@ | |||
647 | 55 | { | 55 | { |
648 | 56 | package Percona::Toolkit; | 56 | package Percona::Toolkit; |
649 | 57 | 57 | ||
651 | 58 | our $VERSION = '2.2.10'; | 58 | our $VERSION = '2.2.11'; |
652 | 59 | 59 | ||
653 | 60 | use strict; | 60 | use strict; |
654 | 61 | use warnings FATAL => 'all'; | 61 | use warnings FATAL => 'all'; |
655 | @@ -12768,6 +12768,6 @@ | |||
656 | 12768 | 12768 | ||
657 | 12769 | =head1 VERSION | 12769 | =head1 VERSION |
658 | 12770 | 12770 | ||
660 | 12771 | pt-table-sync 2.2.10 | 12771 | pt-table-sync 2.2.11 |
661 | 12772 | 12772 | ||
662 | 12773 | =cut | 12773 | =cut |
663 | 12774 | 12774 | ||
664 | === modified file 'bin/pt-table-usage' | |||
665 | --- bin/pt-table-usage 2014-08-05 20:37:42 +0000 | |||
666 | +++ bin/pt-table-usage 2014-09-29 19:43:03 +0000 | |||
667 | @@ -1629,6 +1629,7 @@ | |||
668 | 1629 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 1629 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
669 | 1630 | ) { | 1630 | ) { |
670 | 1631 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 1631 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
671 | 1632 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
672 | 1632 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 1633 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
673 | 1633 | if ( $thread_id ) { | 1634 | if ( $thread_id ) { |
674 | 1634 | push @properties, 'Thread_id', $thread_id; | 1635 | push @properties, 'Thread_id', $thread_id; |
675 | @@ -1641,6 +1642,7 @@ | |||
676 | 1641 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 1642 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
677 | 1642 | ) { | 1643 | ) { |
678 | 1643 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 1644 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
679 | 1645 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
680 | 1644 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 1646 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
681 | 1645 | if ( $thread_id ) { | 1647 | if ( $thread_id ) { |
682 | 1646 | push @properties, 'Thread_id', $thread_id; | 1648 | push @properties, 'Thread_id', $thread_id; |
683 | @@ -7561,6 +7563,6 @@ | |||
684 | 7561 | 7563 | ||
685 | 7562 | =head1 VERSION | 7564 | =head1 VERSION |
686 | 7563 | 7565 | ||
688 | 7564 | pt-table-usage 2.2.10 | 7566 | pt-table-usage 2.2.11 |
689 | 7565 | 7567 | ||
690 | 7566 | =cut | 7568 | =cut |
691 | 7567 | 7569 | ||
692 | === modified file 'bin/pt-upgrade' | |||
693 | --- bin/pt-upgrade 2014-08-05 20:37:42 +0000 | |||
694 | +++ bin/pt-upgrade 2014-09-29 19:43:03 +0000 | |||
695 | @@ -61,7 +61,7 @@ | |||
696 | 61 | { | 61 | { |
697 | 62 | package Percona::Toolkit; | 62 | package Percona::Toolkit; |
698 | 63 | 63 | ||
700 | 64 | our $VERSION = '2.2.10'; | 64 | our $VERSION = '2.2.11'; |
701 | 65 | 65 | ||
702 | 66 | use strict; | 66 | use strict; |
703 | 67 | use warnings FATAL => 'all'; | 67 | use warnings FATAL => 'all'; |
704 | @@ -6610,6 +6610,7 @@ | |||
705 | 6610 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 6610 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
706 | 6611 | ) { | 6611 | ) { |
707 | 6612 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 6612 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
708 | 6613 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
709 | 6613 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 6614 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
710 | 6614 | if ( $thread_id ) { | 6615 | if ( $thread_id ) { |
711 | 6615 | push @properties, 'Thread_id', $thread_id; | 6616 | push @properties, 'Thread_id', $thread_id; |
712 | @@ -6622,6 +6623,7 @@ | |||
713 | 6622 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 6623 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
714 | 6623 | ) { | 6624 | ) { |
715 | 6624 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 6625 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
716 | 6626 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
717 | 6625 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 6627 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
718 | 6626 | if ( $thread_id ) { | 6628 | if ( $thread_id ) { |
719 | 6627 | push @properties, 'Thread_id', $thread_id; | 6629 | push @properties, 'Thread_id', $thread_id; |
720 | @@ -11238,6 +11240,6 @@ | |||
721 | 11238 | 11240 | ||
722 | 11239 | =head1 VERSION | 11241 | =head1 VERSION |
723 | 11240 | 11242 | ||
725 | 11241 | pt-upgrade 2.2.10 | 11243 | pt-upgrade 2.2.11 |
726 | 11242 | 11244 | ||
727 | 11243 | =cut | 11245 | =cut |
728 | 11244 | 11246 | ||
729 | === modified file 'bin/pt-variable-advisor' | |||
730 | --- bin/pt-variable-advisor 2014-08-05 20:37:42 +0000 | |||
731 | +++ bin/pt-variable-advisor 2014-09-29 19:43:03 +0000 | |||
732 | @@ -44,7 +44,7 @@ | |||
733 | 44 | { | 44 | { |
734 | 45 | package Percona::Toolkit; | 45 | package Percona::Toolkit; |
735 | 46 | 46 | ||
737 | 47 | our $VERSION = '2.2.10'; | 47 | our $VERSION = '2.2.11'; |
738 | 48 | 48 | ||
739 | 49 | use strict; | 49 | use strict; |
740 | 50 | use warnings FATAL => 'all'; | 50 | use warnings FATAL => 'all'; |
741 | @@ -3601,10 +3601,10 @@ | |||
742 | 3601 | }, | 3601 | }, |
743 | 3602 | }, | 3602 | }, |
744 | 3603 | { | 3603 | { |
746 | 3604 | id => 'expire_log_days', | 3604 | id => 'expire_logs_days', |
747 | 3605 | code => sub { | 3605 | code => sub { |
748 | 3606 | my ( %args ) = @_; | 3606 | my ( %args ) = @_; |
750 | 3607 | return _var_eq($args{variables}->{expire_log_days}, 0) | 3607 | return _var_eq($args{variables}->{expire_logs_days}, 0) |
751 | 3608 | && _var_seq($args{variables}->{log_bin}, "ON"); | 3608 | && _var_seq($args{variables}->{log_bin}, "ON"); |
752 | 3609 | }, | 3609 | }, |
753 | 3610 | }, | 3610 | }, |
754 | @@ -5720,7 +5720,7 @@ | |||
755 | 5720 | Most applications should use the default REPEATABLE-READ transaction | 5720 | Most applications should use the default REPEATABLE-READ transaction |
756 | 5721 | isolation level, or in a few cases READ-COMMITTED. | 5721 | isolation level, or in a few cases READ-COMMITTED. |
757 | 5722 | 5722 | ||
759 | 5723 | =item expire_log_days | 5723 | =item expire_logs_days |
760 | 5724 | 5724 | ||
761 | 5725 | severity: warn | 5725 | severity: warn |
762 | 5726 | 5726 | ||
763 | @@ -6138,6 +6138,6 @@ | |||
764 | 6138 | 6138 | ||
765 | 6139 | =head1 VERSION | 6139 | =head1 VERSION |
766 | 6140 | 6140 | ||
768 | 6141 | pt-variable-advisor 2.2.10 | 6141 | pt-variable-advisor 2.2.11 |
769 | 6142 | 6142 | ||
770 | 6143 | =cut | 6143 | =cut |
771 | 6144 | 6144 | ||
772 | === modified file 'bin/pt-visual-explain' | |||
773 | --- bin/pt-visual-explain 2014-08-05 20:37:42 +0000 | |||
774 | +++ bin/pt-visual-explain 2014-09-29 19:43:03 +0000 | |||
775 | @@ -3243,6 +3243,6 @@ | |||
776 | 3243 | 3243 | ||
777 | 3244 | =head1 VERSION | 3244 | =head1 VERSION |
778 | 3245 | 3245 | ||
780 | 3246 | pt-visual-explain 2.2.10 | 3246 | pt-visual-explain 2.2.11 |
781 | 3247 | 3247 | ||
782 | 3248 | =cut | 3248 | =cut |
783 | 3249 | 3249 | ||
784 | === modified file 'config/deb/changelog' | |||
785 | --- config/deb/changelog 2014-08-06 19:55:47 +0000 | |||
786 | +++ config/deb/changelog 2014-09-29 19:43:03 +0000 | |||
787 | @@ -1,3 +1,15 @@ | |||
788 | 1 | percona-toolkit (2.2.11) unstable; urgency=low | ||
789 | 2 | |||
790 | 3 | * Fixed bug 1262456: pt-query-digest doesn't report host details | ||
791 | 4 | * Fixed bug 1264580: pt-mysql-summary incorrectly tries to parse key/value pairs in wsrep_provider_options resulting in incomplete my.cnf information | ||
792 | 5 | * Fixed bug 1318985: pt-stalk should use SQL_NO_CACHE | ||
793 | 6 | * Fixed bug 1348679: pt-stalk handles mysql user password in awkward way | ||
794 | 7 | * Fixed bug 1365085: Various issues with tests | ||
795 | 8 | * Fixed bug 1368379: pt-summary problem parsing dmidecode output on some machines | ||
796 | 9 | * Fixed bug 1303388: Typo in pt-variable-advisor | ||
797 | 10 | |||
798 | 11 | -- Percona Toolkit Developers <toolkit-dev@percona.com> Thu, 25 Sep 2014 13:43:24 +0000 | ||
799 | 12 | |||
800 | 1 | percona-toolkit (2.2.10) unstable; urgency=low | 13 | percona-toolkit (2.2.10) unstable; urgency=low |
801 | 2 | 14 | ||
802 | 3 | * Fixed bug 1287253: pt-table-checksum deadlock | 15 | * Fixed bug 1287253: pt-table-checksum deadlock |
803 | 4 | 16 | ||
804 | === modified file 'config/rpm/percona-toolkit.spec' | |||
805 | --- config/rpm/percona-toolkit.spec 2013-03-14 16:58:03 +0000 | |||
806 | +++ config/rpm/percona-toolkit.spec 2014-09-29 19:43:03 +0000 | |||
807 | @@ -9,7 +9,7 @@ | |||
808 | 9 | Source: percona-toolkit-%{version}.tar.gz | 9 | Source: percona-toolkit-%{version}.tar.gz |
809 | 10 | BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root | 10 | BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root |
810 | 11 | BuildArch: noarch | 11 | BuildArch: noarch |
812 | 12 | Requires: perl(DBI) >= 1.13, perl(DBD::mysql) >= 1.0, perl(Time::HiRes), perl(IO::Socket::SSL) | 12 | Requires: perl(DBI) >= 1.13, perl(DBD::mysql) >= 1.0, perl(Time::HiRes), perl(IO::Socket::SSL), perl(Digest::MD5) |
813 | 13 | AutoReq: no | 13 | AutoReq: no |
814 | 14 | 14 | ||
815 | 15 | %description | 15 | %description |
816 | 16 | 16 | ||
817 | === modified file 'config/sphinx-build/conf.py' | |||
818 | --- config/sphinx-build/conf.py 2014-08-06 19:55:47 +0000 | |||
819 | +++ config/sphinx-build/conf.py 2014-09-29 19:43:03 +0000 | |||
820 | @@ -50,7 +50,7 @@ | |||
821 | 50 | # The short X.Y version. | 50 | # The short X.Y version. |
822 | 51 | version = '2.2' | 51 | version = '2.2' |
823 | 52 | # The full version, including alpha/beta/rc tags. | 52 | # The full version, including alpha/beta/rc tags. |
825 | 53 | release = '2.2.10' | 53 | release = '2.2.11' |
826 | 54 | 54 | ||
827 | 55 | # The language for content autogenerated by Sphinx. Refer to documentation | 55 | # The language for content autogenerated by Sphinx. Refer to documentation |
828 | 56 | # for a list of supported languages. | 56 | # for a list of supported languages. |
829 | 57 | 57 | ||
830 | === modified file 'docs/percona-toolkit.pod' | |||
831 | --- docs/percona-toolkit.pod 2014-08-06 19:55:47 +0000 | |||
832 | +++ docs/percona-toolkit.pod 2014-09-29 19:43:03 +0000 | |||
833 | @@ -557,6 +557,6 @@ | |||
834 | 557 | 557 | ||
835 | 558 | =head1 VERSION | 558 | =head1 VERSION |
836 | 559 | 559 | ||
838 | 560 | Percona Toolkit v2.2.10 released 2014-08-06 | 560 | Percona Toolkit v2.2.11 released 2014-09-25 |
839 | 561 | 561 | ||
840 | 562 | =cut | 562 | =cut |
841 | 563 | 563 | ||
842 | === modified file 'docs/release_notes.rst' | |||
843 | --- docs/release_notes.rst 2014-08-06 19:55:47 +0000 | |||
844 | +++ docs/release_notes.rst 2014-09-29 19:43:03 +0000 | |||
845 | @@ -1,6 +1,34 @@ | |||
846 | 1 | Release Notes | 1 | Release Notes |
847 | 2 | ************* | 2 | ************* |
848 | 3 | 3 | ||
849 | 4 | v2.2.11 released 2014-09-26 | ||
850 | 5 | =========================== | ||
851 | 6 | |||
852 | 7 | Percona Toolkit 2.2.11 has been released. This release contains seven bug fixes. | ||
853 | 8 | |||
854 | 9 | Bugs Fixed: | ||
855 | 10 | |||
856 | 11 | * Fixed bug 1262456: pt-query-digest didn't report host details when host was using skip-name-resolve option. Fixed by using the IP of the host instead of it's name, when the hostname is missing. | ||
857 | 12 | |||
858 | 13 | * Fixed bug 1264580: pt-mysql-summary was incorrectly parsing key/value pairs in the wsrep_provider_options option, which resulted in incomplete my.cnf information. | ||
859 | 14 | |||
860 | 15 | * Fixed bug 1318985: pt-stalk is now using ``SQL_NO_CACHE`` when executing queries for locks and transactions. Previously this could lead to situations where most of the queries that were ``waiting on query cache mutex`` were the pt-stalk queries (INNODB_TRX). | ||
861 | 16 | |||
862 | 17 | * Fixed bug 1348679: When using ``-- -p`` option to enter the password for pt-stalk it would ask user to re-enter the password every time tool connects to the server to retrieve the information. New option ``--ask-pass`` has been introduced that can be used to specify the password only once. | ||
863 | 18 | |||
864 | 19 | * Fixed bug 1368379: A parsing error caused pt-summary ( specifically the ``report_system_info`` module) to choke on the "Memory Device" parameter named "Configured Clock Speed" when using dmidecode to report memory slot information. | ||
865 | 20 | |||
866 | 21 | Changelog | ||
867 | 22 | --------- | ||
868 | 23 | |||
869 | 24 | * Fixed bug 1262456: pt-query-digest doesn't report host details | ||
870 | 25 | * Fixed bug 1264580: pt-mysql-summary incorrectly tries to parse key/value pairs in wsrep_provider_options resulting in incomplete my.cnf information | ||
871 | 26 | * Fixed bug 1318985: pt-stalk should use SQL_NO_CACHE | ||
872 | 27 | * Fixed bug 1348679: pt-stalk handles mysql user password in awkward way | ||
873 | 28 | * Fixed bug 1365085: Various issues with tests | ||
874 | 29 | * Fixed bug 1368379: pt-summary problem parsing dmidecode output on some machines | ||
875 | 30 | * Fixed bug 1303388: Typo in pt-variable-advisor | ||
876 | 31 | |||
877 | 4 | v2.2.10 released 2014-08-06 | 32 | v2.2.10 released 2014-08-06 |
878 | 5 | =========================== | 33 | =========================== |
879 | 6 | 34 | ||
880 | 7 | 35 | ||
881 | === modified file 'lib/Percona/Toolkit.pm' | |||
882 | --- lib/Percona/Toolkit.pm 2014-08-05 20:37:42 +0000 | |||
883 | +++ lib/Percona/Toolkit.pm 2014-09-29 19:43:03 +0000 | |||
884 | @@ -18,7 +18,7 @@ | |||
885 | 18 | # ########################################################################### | 18 | # ########################################################################### |
886 | 19 | package Percona::Toolkit; | 19 | package Percona::Toolkit; |
887 | 20 | 20 | ||
889 | 21 | our $VERSION = '2.2.10'; | 21 | our $VERSION = '2.2.11'; |
890 | 22 | 22 | ||
891 | 23 | use strict; | 23 | use strict; |
892 | 24 | use warnings FATAL => 'all'; | 24 | use warnings FATAL => 'all'; |
893 | 25 | 25 | ||
894 | === modified file 'lib/Sandbox.pm' | |||
895 | --- lib/Sandbox.pm 2014-05-28 20:31:10 +0000 | |||
896 | +++ lib/Sandbox.pm 2014-09-29 19:43:03 +0000 | |||
897 | @@ -374,6 +374,10 @@ | |||
898 | 374 | . join(", ", map { "mysql.$_" } @tables_in_mysql) | 374 | . join(", ", map { "mysql.$_" } @tables_in_mysql) |
899 | 375 | . ", " | 375 | . ", " |
900 | 376 | . join(", ", map { "sakila.$_" } @tables_in_sakila); | 376 | . join(", ", map { "sakila.$_" } @tables_in_sakila); |
901 | 377 | |||
902 | 378 | # remove leading "," if any | ||
903 | 379 | $sql =~ s/CHECKSUM TABLES\s+,/CHECKSUM TABLES /; | ||
904 | 380 | |||
905 | 377 | my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })}; | 381 | my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })}; |
906 | 378 | 382 | ||
907 | 379 | # Diff the two sets of checksums: host to master (ref). | 383 | # Diff the two sets of checksums: host to master (ref). |
908 | 380 | 384 | ||
909 | === modified file 'lib/SlowLogParser.pm' | |||
910 | --- lib/SlowLogParser.pm 2014-07-30 20:25:29 +0000 | |||
911 | +++ lib/SlowLogParser.pm 2014-09-29 19:43:03 +0000 | |||
912 | @@ -162,6 +162,7 @@ | |||
913 | 162 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 162 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
914 | 163 | ) { | 163 | ) { |
915 | 164 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 164 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
916 | 165 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
917 | 165 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 166 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
918 | 166 | # 5.6 has the thread id on the User@Host line | 167 | # 5.6 has the thread id on the User@Host line |
919 | 167 | if ( $thread_id ) { | 168 | if ( $thread_id ) { |
920 | @@ -177,6 +178,7 @@ | |||
921 | 177 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) | 178 | && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o ) |
922 | 178 | ) { | 179 | ) { |
923 | 179 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); | 180 | PTDEBUG && _d("Got user, host, ip", $user, $host, $ip); |
924 | 181 | $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456) | ||
925 | 180 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; | 182 | push @properties, 'user', $user, 'host', $host, 'ip', $ip; |
926 | 181 | # 5.6 has the thread id on the User@Host line | 183 | # 5.6 has the thread id on the User@Host line |
927 | 182 | if ( $thread_id ) { | 184 | if ( $thread_id ) { |
928 | 183 | 185 | ||
929 | === modified file 'lib/VariableAdvisorRules.pm' | |||
930 | --- lib/VariableAdvisorRules.pm 2013-08-08 15:35:19 +0000 | |||
931 | +++ lib/VariableAdvisorRules.pm 2014-09-29 19:43:03 +0000 | |||
932 | @@ -430,10 +430,10 @@ | |||
933 | 430 | }, | 430 | }, |
934 | 431 | }, | 431 | }, |
935 | 432 | { | 432 | { |
937 | 433 | id => 'expire_log_days', | 433 | id => 'expire_logs_days', |
938 | 434 | code => sub { | 434 | code => sub { |
939 | 435 | my ( %args ) = @_; | 435 | my ( %args ) = @_; |
941 | 436 | return _var_eq($args{variables}->{expire_log_days}, 0) | 436 | return _var_eq($args{variables}->{expire_logs_days}, 0) |
942 | 437 | && _var_seq($args{variables}->{log_bin}, "ON"); | 437 | && _var_seq($args{variables}->{log_bin}, "ON"); |
943 | 438 | }, | 438 | }, |
944 | 439 | }, | 439 | }, |
945 | 440 | 440 | ||
946 | === modified file 'lib/bash/report_mysql_info.sh' | |||
947 | --- lib/bash/report_mysql_info.sh 2013-12-12 05:49:59 +0000 | |||
948 | +++ lib/bash/report_mysql_info.sh 2014-09-29 19:43:03 +0000 | |||
949 | @@ -345,37 +345,28 @@ | |||
950 | 345 | echo | 345 | echo |
951 | 346 | } | 346 | } |
952 | 347 | 347 | ||
957 | 348 | # Pretty-prints the my.cnf file. It's super annoying, but some *modern* | 348 | # Pretty-prints the my.cnf file. |
954 | 349 | # versions of awk don't support POSIX character sets in regular | ||
955 | 350 | # expressions, like [[:space:]] (looking at you, Debian). So | ||
956 | 351 | # the below patterns contain [<space><tab>] and must remain that way. | ||
958 | 352 | pretty_print_cnf_file () { | 349 | pretty_print_cnf_file () { |
959 | 353 | local file="$1" | 350 | local file="$1" |
960 | 354 | 351 | ||
961 | 355 | [ -e "$file" ] || return | 352 | [ -e "$file" ] || return |
962 | 356 | 353 | ||
983 | 357 | awk ' | 354 | perl -n -l -e ' |
984 | 358 | BEGIN { | 355 | my $line = $_; |
985 | 359 | FS="=" | 356 | if ( $line =~ /^\s*[a-zA-Z[]/ ) { |
986 | 360 | } | 357 | if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) { |
987 | 361 | /^[ \t]*[a-zA-Z[]/ { | 358 | printf("%-35s = %s\n", $1, $2) |
988 | 362 | if (length($2)) { | 359 | } |
989 | 363 | gsub(/^[ \t]*/, "", $1); | 360 | elsif ( $line =~ /\s*\[/ ) { |
990 | 364 | gsub(/^[ \t]*/, "", $2); | 361 | print "\n$line" |
991 | 365 | gsub(/[ \t]*$/, "", $1); | 362 | } else { |
992 | 366 | gsub(/[ \t]*$/, "", $2); | 363 | print $line |
993 | 367 | printf("%-35s = %s\n", $1, $2); | 364 | } |
994 | 368 | } | 365 | }' "$file" |
995 | 369 | else if ( $0 ~ /\[/ ) { | 366 | |
976 | 370 | print ""; | ||
977 | 371 | print $1; | ||
978 | 372 | } | ||
979 | 373 | else { | ||
980 | 374 | print $1; | ||
981 | 375 | } | ||
982 | 376 | }' "$file" | ||
996 | 377 | } | 367 | } |
997 | 378 | 368 | ||
998 | 369 | |||
999 | 379 | find_checkpoint_age() { | 370 | find_checkpoint_age() { |
1000 | 380 | local file="$1" | 371 | local file="$1" |
1001 | 381 | awk ' | 372 | awk ' |
1002 | 382 | 373 | ||
1003 | === modified file 'lib/bash/report_system_info.sh' | |||
1004 | --- lib/bash/report_system_info.sh 2012-08-24 22:39:58 +0000 | |||
1005 | +++ lib/bash/report_system_info.sh 2014-09-29 19:43:03 +0000 | |||
1006 | @@ -230,7 +230,7 @@ | |||
1007 | 230 | -e 's/>/}/g' \ | 230 | -e 's/>/}/g' \ |
1008 | 231 | -e 's/[ \t]*\n/\n/g' \ | 231 | -e 's/[ \t]*\n/\n/g' \ |
1009 | 232 | "${file}" \ | 232 | "${file}" \ |
1011 | 233 | | awk -F: '/Size|Type|Form.Factor|Type.Detail|[^ ]Locator/{printf("|%s", $2)}/Speed/{print "|" $2}' \ | 233 | | awk -F: '/Size|Type|Form.Factor|Type.Detail|^[\t ]+Locator/{printf("|%s", $2)}/^[\t ]+Speed/{print "|" $2}' \ |
1012 | 234 | | sed -e 's/No Module Installed/{EMPTY}/' \ | 234 | | sed -e 's/No Module Installed/{EMPTY}/' \ |
1013 | 235 | | sort \ | 235 | | sort \ |
1014 | 236 | | awk -F'|' '{printf(" %-9s %-8s %-17s %-13s %-13s %-8s\n", $4, $2, $7, $3, $5, $6);}' | 236 | | awk -F'|' '{printf(" %-9s %-8s %-17s %-13s %-13s %-8s\n", $4, $2, $7, $3, $5, $6);}' |
1015 | 237 | 237 | ||
1016 | === modified file 'sandbox/start-sandbox' | |||
1017 | --- sandbox/start-sandbox 2014-04-30 14:53:04 +0000 | |||
1018 | +++ sandbox/start-sandbox 2014-09-29 19:43:03 +0000 | |||
1019 | @@ -240,7 +240,7 @@ | |||
1020 | 240 | 240 | ||
1021 | 241 | if [ $type = "cluster" -o $APP = "pxc" ]; then | 241 | if [ $type = "cluster" -o $APP = "pxc" ]; then |
1022 | 242 | ip=$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public') | 242 | ip=$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public') |
1024 | 243 | version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V --bind-address $ip 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`; | 243 | version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V --query_cache_size=0 --query_cache_type=0 --bind-address $ip 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`; |
1025 | 244 | else | 244 | else |
1026 | 245 | version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`; | 245 | version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`; |
1027 | 246 | fi | 246 | fi |
1028 | 247 | 247 | ||
1029 | === modified file 't/lib/Percona/Toolkit.t' | |||
1030 | --- t/lib/Percona/Toolkit.t 2013-08-08 19:34:29 +0000 | |||
1031 | +++ t/lib/Percona/Toolkit.t 2014-09-29 19:43:03 +0000 | |||
1032 | @@ -75,6 +75,8 @@ | |||
1033 | 75 | unless $root eq $trunk; | 75 | unless $root eq $trunk; |
1034 | 76 | 76 | ||
1035 | 77 | my @tags = split /\n/, `$bzr tags`; | 77 | my @tags = split /\n/, `$bzr tags`; |
1036 | 78 | # sort the version numbers (some bzr versions do not sort them) | ||
1037 | 79 | @tags = sort { calc_value($a) <=> calc_value($b) } @tags; | ||
1038 | 78 | my ($current_tag) = $tags[-1] =~ /^(\S+)/; | 80 | my ($current_tag) = $tags[-1] =~ /^(\S+)/; |
1039 | 79 | 81 | ||
1040 | 80 | is( | 82 | is( |
1041 | @@ -84,4 +86,18 @@ | |||
1042 | 84 | ); | 86 | ); |
1043 | 85 | } | 87 | } |
1044 | 86 | 88 | ||
1045 | 89 | # we use this function to help sort version numbers | ||
1046 | 90 | sub calc_value { | ||
1047 | 91 | my $version = shift; | ||
1048 | 92 | $version =~ s/ +[^ ]*$//; | ||
1049 | 93 | my $value = 0; | ||
1050 | 94 | my $exp = 0; | ||
1051 | 95 | foreach my $num (reverse split /\./, $version) { | ||
1052 | 96 | $value += $num * 10 ** $exp++; | ||
1053 | 97 | } | ||
1054 | 98 | print "$version = $value\n"; | ||
1055 | 99 | return $value; | ||
1056 | 100 | } | ||
1057 | 101 | |||
1058 | 102 | |||
1059 | 87 | done_testing; | 103 | done_testing; |
1060 | 88 | 104 | ||
1061 | === modified file 't/lib/SlowLogParser.t' | |||
1062 | --- t/lib/SlowLogParser.t 2014-07-30 20:25:29 +0000 | |||
1063 | +++ t/lib/SlowLogParser.t 2014-09-29 19:43:03 +0000 | |||
1064 | @@ -587,7 +587,7 @@ | |||
1065 | 587 | 'ip' => '1.2.3.8', | 587 | 'ip' => '1.2.3.8', |
1066 | 588 | 'arg' => 'administrator command: Quit', | 588 | 'arg' => 'administrator command: Quit', |
1067 | 589 | 'Thread_id' => '5', | 589 | 'Thread_id' => '5', |
1069 | 590 | 'host' => '', | 590 | 'host' => '1.2.3.8', |
1070 | 591 | 'Rows_examined' => '0', | 591 | 'Rows_examined' => '0', |
1071 | 592 | 'user' => 'meow', | 592 | 'user' => 'meow', |
1072 | 593 | 'Query_time' => '0.000002', | 593 | 'Query_time' => '0.000002', |
1073 | @@ -602,7 +602,7 @@ | |||
1074 | 602 | 'ip' => '1.2.3.8', | 602 | 'ip' => '1.2.3.8', |
1075 | 603 | arg => 'SET NAMES utf8', | 603 | arg => 'SET NAMES utf8', |
1076 | 604 | 'Thread_id' => '6', | 604 | 'Thread_id' => '6', |
1078 | 605 | 'host' => '', | 605 | 'host' => '1.2.3.8', |
1079 | 606 | 'Rows_examined' => '0', | 606 | 'Rows_examined' => '0', |
1080 | 607 | 'user' => 'meow', | 607 | 'user' => 'meow', |
1081 | 608 | 'Query_time' => '0.000899', | 608 | 'Query_time' => '0.000899', |
1082 | @@ -616,7 +616,7 @@ | |||
1083 | 616 | 'arg' => 'SELECT MIN(id),MAX(id) FROM tbl', | 616 | 'arg' => 'SELECT MIN(id),MAX(id) FROM tbl', |
1084 | 617 | 'ip' => '1.2.3.8', | 617 | 'ip' => '1.2.3.8', |
1085 | 618 | 'Thread_id' => '6', | 618 | 'Thread_id' => '6', |
1087 | 619 | 'host' => '', | 619 | 'host' => '1.2.3.8', |
1088 | 620 | 'Rows_examined' => '0', | 620 | 'Rows_examined' => '0', |
1089 | 621 | 'user' => 'meow', | 621 | 'user' => 'meow', |
1090 | 622 | 'Query_time' => '0.018799', | 622 | 'Query_time' => '0.018799', |
1091 | @@ -664,7 +664,7 @@ | |||
1092 | 664 | 'arg' => 'administrator command: Quit', | 664 | 'arg' => 'administrator command: Quit', |
1093 | 665 | 'ip' => '1.2.3.8', | 665 | 'ip' => '1.2.3.8', |
1094 | 666 | 'Thread_id' => '5', | 666 | 'Thread_id' => '5', |
1096 | 667 | 'host' => '', | 667 | 'host' => '1.2.3.8', |
1097 | 668 | 'Rows_examined' => '0', | 668 | 'Rows_examined' => '0', |
1098 | 669 | 'user' => 'meow', | 669 | 'user' => 'meow', |
1099 | 670 | 'Query_time' => '0.000002', | 670 | 'Query_time' => '0.000002', |
1100 | @@ -679,7 +679,7 @@ | |||
1101 | 679 | 'ip' => '1.2.3.8', | 679 | 'ip' => '1.2.3.8', |
1102 | 680 | arg => 'SET NAMES utf8', | 680 | arg => 'SET NAMES utf8', |
1103 | 681 | 'Thread_id' => '6', | 681 | 'Thread_id' => '6', |
1105 | 682 | 'host' => '', | 682 | 'host' => '1.2.3.8', |
1106 | 683 | 'Rows_examined' => '0', | 683 | 'Rows_examined' => '0', |
1107 | 684 | 'user' => 'meow', | 684 | 'user' => 'meow', |
1108 | 685 | 'Query_time' => '0.000899', | 685 | 'Query_time' => '0.000899', |
1109 | @@ -694,7 +694,7 @@ | |||
1110 | 694 | 'arg' => 'administrator command: Quit', | 694 | 'arg' => 'administrator command: Quit', |
1111 | 695 | 'ip' => '1.2.3.8', | 695 | 'ip' => '1.2.3.8', |
1112 | 696 | 'Thread_id' => '7', | 696 | 'Thread_id' => '7', |
1114 | 697 | 'host' => '', | 697 | 'host' => '1.2.3.8', |
1115 | 698 | 'Rows_examined' => '0', | 698 | 'Rows_examined' => '0', |
1116 | 699 | 'user' => 'meow', | 699 | 'user' => 'meow', |
1117 | 700 | 'Query_time' => '0.018799', | 700 | 'Query_time' => '0.018799', |
1118 | @@ -709,7 +709,7 @@ | |||
1119 | 709 | 'ip' => '1.2.3.8', | 709 | 'ip' => '1.2.3.8', |
1120 | 710 | arg => 'SET NAMES utf8', | 710 | arg => 'SET NAMES utf8', |
1121 | 711 | 'Thread_id' => '9', | 711 | 'Thread_id' => '9', |
1123 | 712 | 'host' => '', | 712 | 'host' => '1.2.3.8', |
1124 | 713 | 'Rows_examined' => '0', | 713 | 'Rows_examined' => '0', |
1125 | 714 | 'user' => 'meow', | 714 | 'user' => 'meow', |
1126 | 715 | 'Query_time' => '0.000899', | 715 | 'Query_time' => '0.000899', |
1127 | @@ -731,7 +731,7 @@ | |||
1128 | 731 | 'arg' => 'SET autocommit=1', | 731 | 'arg' => 'SET autocommit=1', |
1129 | 732 | 'ip' => '10.1.250.19', | 732 | 'ip' => '10.1.250.19', |
1130 | 733 | 'Thread_id' => '39387', | 733 | 'Thread_id' => '39387', |
1132 | 734 | 'host' => '', | 734 | 'host' => '10.1.250.19', |
1133 | 735 | 'Rows_examined' => '0', | 735 | 'Rows_examined' => '0', |
1134 | 736 | 'user' => 'sabapp', | 736 | 'user' => 'sabapp', |
1135 | 737 | 'Query_time' => '0.000018', | 737 | 'Query_time' => '0.000018', |
1136 | @@ -745,7 +745,7 @@ | |||
1137 | 745 | 'arg' => 'SET autocommit=1', | 745 | 'arg' => 'SET autocommit=1', |
1138 | 746 | 'ip' => '10.1.250.19', | 746 | 'ip' => '10.1.250.19', |
1139 | 747 | 'Thread_id' => '39387', | 747 | 'Thread_id' => '39387', |
1141 | 748 | 'host' => '', | 748 | 'host' => '10.1.250.19', |
1142 | 749 | 'Rows_examined' => '0', | 749 | 'Rows_examined' => '0', |
1143 | 750 | 'user' => 'sabapp', | 750 | 'user' => 'sabapp', |
1144 | 751 | 'Query_time' => '0.000018', | 751 | 'Query_time' => '0.000018', |
1145 | @@ -769,7 +769,7 @@ | |||
1146 | 769 | 'arg' => 'SET autocommit=1', | 769 | 'arg' => 'SET autocommit=1', |
1147 | 770 | 'ip' => '10.1.250.19', | 770 | 'ip' => '10.1.250.19', |
1148 | 771 | 'Thread_id' => '39796', | 771 | 'Thread_id' => '39796', |
1150 | 772 | 'host' => '', | 772 | 'host' => '10.1.250.19', |
1151 | 773 | 'pos_in_log' => '0', | 773 | 'pos_in_log' => '0', |
1152 | 774 | 'Rows_examined' => '0', | 774 | 'Rows_examined' => '0', |
1153 | 775 | 'user' => 'foo_app', | 775 | 'user' => 'foo_app', |
1154 | @@ -785,7 +785,7 @@ | |||
1155 | 785 | 'ip' => '10.1.12.201', | 785 | 'ip' => '10.1.12.201', |
1156 | 786 | 'ts' => '081127 8:51:20', | 786 | 'ts' => '081127 8:51:20', |
1157 | 787 | 'Thread_id' => '39947', | 787 | 'Thread_id' => '39947', |
1159 | 788 | 'host' => '', | 788 | 'host' => '10.1.12.201', |
1160 | 789 | 'pos_in_log' => '174', | 789 | 'pos_in_log' => '174', |
1161 | 790 | 'Rows_examined' => '226', | 790 | 'Rows_examined' => '226', |
1162 | 791 | 'Query_time' => '0.149435', | 791 | 'Query_time' => '0.149435', |
1163 | @@ -800,7 +800,7 @@ | |||
1164 | 800 | 'ip' => '10.1.12.201', | 800 | 'ip' => '10.1.12.201', |
1165 | 801 | 'ts' => '081127 8:51:21', | 801 | 'ts' => '081127 8:51:21', |
1166 | 802 | 'Thread_id' => '39947', | 802 | 'Thread_id' => '39947', |
1168 | 803 | 'host' => '', | 803 | 'host' => '10.1.12.201', |
1169 | 804 | 'pos_in_log' => '385', | 804 | 'pos_in_log' => '385', |
1170 | 805 | 'Rows_examined' => '0', | 805 | 'Rows_examined' => '0', |
1171 | 806 | 'Query_time' => '0.000005', | 806 | 'Query_time' => '0.000005', |
1172 | @@ -815,7 +815,7 @@ | |||
1173 | 815 | 'arg' => 'SET autocommit=0', | 815 | 'arg' => 'SET autocommit=0', |
1174 | 816 | 'ip' => '10.1.250.19', | 816 | 'ip' => '10.1.250.19', |
1175 | 817 | 'Thread_id' => '39796', | 817 | 'Thread_id' => '39796', |
1177 | 818 | 'host' => '', | 818 | 'host' => '10.1.250.19', |
1178 | 819 | 'pos_in_log' => '600', | 819 | 'pos_in_log' => '600', |
1179 | 820 | 'Rows_examined' => '0', | 820 | 'Rows_examined' => '0', |
1180 | 821 | 'user' => 'foo_app', | 821 | 'user' => 'foo_app', |
1181 | @@ -829,7 +829,7 @@ | |||
1182 | 829 | 'arg' => 'commit', | 829 | 'arg' => 'commit', |
1183 | 830 | 'ip' => '10.1.250.19', | 830 | 'ip' => '10.1.250.19', |
1184 | 831 | 'Thread_id' => '39796', | 831 | 'Thread_id' => '39796', |
1186 | 832 | 'host' => '', | 832 | 'host' => '10.1.250.19', |
1187 | 833 | 'pos_in_log' => '782', | 833 | 'pos_in_log' => '782', |
1188 | 834 | 'Rows_examined' => '0', | 834 | 'Rows_examined' => '0', |
1189 | 835 | 'user' => 'foo_app', | 835 | 'user' => 'foo_app', |
1190 | @@ -965,7 +965,7 @@ | |||
1191 | 965 | Thread_id => '5', | 965 | Thread_id => '5', |
1192 | 966 | arg => 'administrator command: Quit', | 966 | arg => 'administrator command: Quit', |
1193 | 967 | cmd => 'Admin', | 967 | cmd => 'Admin', |
1195 | 968 | host => '', | 968 | host => '1.2.3.8', |
1196 | 969 | ip => '1.2.3.8', | 969 | ip => '1.2.3.8', |
1197 | 970 | pos_in_log => '0', | 970 | pos_in_log => '0', |
1198 | 971 | user => 'meow', | 971 | user => 'meow', |
1199 | @@ -980,7 +980,7 @@ | |||
1200 | 980 | arg => 'SET NAMES utf8', | 980 | arg => 'SET NAMES utf8', |
1201 | 981 | cmd => 'Query', | 981 | cmd => 'Query', |
1202 | 982 | db => 'db', | 982 | db => 'db', |
1204 | 983 | host => '', | 983 | host => '1.2.3.8', |
1205 | 984 | ip => '1.2.3.8', | 984 | ip => '1.2.3.8', |
1206 | 985 | pos_in_log => '221', | 985 | pos_in_log => '221', |
1207 | 986 | user => 'meow', | 986 | user => 'meow', |
1208 | @@ -995,7 +995,7 @@ | |||
1209 | 995 | arg => 'administrator command: Quit', | 995 | arg => 'administrator command: Quit', |
1210 | 996 | cmd => 'Admin', | 996 | cmd => 'Admin', |
1211 | 997 | db => 'db2', | 997 | db => 'db2', |
1213 | 998 | host => '', | 998 | host => '1.2.3.8', |
1214 | 999 | ip => '1.2.3.8', | 999 | ip => '1.2.3.8', |
1215 | 1000 | pos_in_log => '435', | 1000 | pos_in_log => '435', |
1216 | 1001 | user => 'meow', | 1001 | user => 'meow', |
1217 | @@ -1184,7 +1184,7 @@ | |||
1218 | 1184 | arg => 'SELECT missing_a_schema_above from crash_me', | 1184 | arg => 'SELECT missing_a_schema_above from crash_me', |
1219 | 1185 | bytes => 43, | 1185 | bytes => 43, |
1220 | 1186 | cmd => 'Query', | 1186 | cmd => 'Query', |
1222 | 1187 | host => '', | 1187 | host => '10.1.12.30', |
1223 | 1188 | ip => '10.1.12.30', | 1188 | ip => '10.1.12.30', |
1224 | 1189 | pos_in_log => '0', | 1189 | pos_in_log => '0', |
1225 | 1190 | ts => '081126 13:08:25', | 1190 | ts => '081126 13:08:25', |
1226 | @@ -1319,7 +1319,7 @@ | |||
1227 | 1319 | Last_errno => 0, | 1319 | Last_errno => 0, |
1228 | 1320 | Killed => 0, | 1320 | Killed => 0, |
1229 | 1321 | db => 'test_db', | 1321 | db => 'test_db', |
1231 | 1322 | host => '', | 1322 | host => '127.0.0.1', |
1232 | 1323 | Schema => 'test_db', | 1323 | Schema => 'test_db', |
1233 | 1324 | ip => '127.0.0.1', | 1324 | ip => '127.0.0.1', |
1234 | 1325 | timestamp => '1111111111', | 1325 | timestamp => '1111111111', |
1235 | @@ -1340,7 +1340,7 @@ | |||
1236 | 1340 | arg => 'update t set b = b + 30 where user_id=1', | 1340 | arg => 'update t set b = b + 30 where user_id=1', |
1237 | 1341 | bytes => 39, | 1341 | bytes => 39, |
1238 | 1342 | cmd => 'Query', | 1342 | cmd => 'Query', |
1240 | 1343 | host => '', | 1343 | host => '127.0.0.1', |
1241 | 1344 | ip => '127.0.0.1', | 1344 | ip => '127.0.0.1', |
1242 | 1345 | pos_in_log => 596, | 1345 | pos_in_log => 596, |
1243 | 1346 | timestamp => '2222222222', | 1346 | timestamp => '2222222222', |
1244 | 1347 | 1347 | ||
1245 | === modified file 't/lib/VariableAdvisorRules.t' | |||
1246 | --- t/lib/VariableAdvisorRules.t 2013-08-08 15:35:19 +0000 | |||
1247 | +++ t/lib/VariableAdvisorRules.t 2014-09-29 19:43:03 +0000 | |||
1248 | @@ -276,12 +276,12 @@ | |||
1249 | 276 | }, | 276 | }, |
1250 | 277 | 277 | ||
1251 | 278 | 278 | ||
1255 | 279 | { name => "expire_log_days", | 279 | { name => "expire_logs_days", |
1256 | 280 | vars => [qw(expire_log_days 0 log_bin ON)], | 280 | vars => [qw(expire_logs_days 0 log_bin ON)], |
1257 | 281 | advice => [qw(expire_log_days)], | 281 | advice => [qw(expire_logs_days)], |
1258 | 282 | }, | 282 | }, |
1261 | 283 | { name => "expire_log_days, log_bin OFF, only warns about log_bin", | 283 | { name => "expire_logs_days, log_bin OFF, only warns about log_bin", |
1262 | 284 | vars => [qw(expire_log_days 0 log_bin OFF)], | 284 | vars => [qw(expire_logs_days 0 log_bin OFF)], |
1263 | 285 | advice => [qw(log_bin)], | 285 | advice => [qw(log_bin)], |
1264 | 286 | }, | 286 | }, |
1265 | 287 | { name => "innodb_file_io_threads", | 287 | { name => "innodb_file_io_threads", |
1266 | 288 | 288 | ||
1267 | === modified file 't/lib/bash/report_mysql_info.sh' | |||
1268 | --- t/lib/bash/report_mysql_info.sh 2013-12-12 05:49:59 +0000 | |||
1269 | +++ t/lib/bash/report_mysql_info.sh 2014-09-29 19:43:03 +0000 | |||
1270 | @@ -172,6 +172,7 @@ | |||
1271 | 172 | ssl = 1 | 172 | ssl = 1 |
1272 | 173 | server-id = 1 | 173 | server-id = 1 |
1273 | 174 | log-bin = sl1-bin | 174 | log-bin = sl1-bin |
1274 | 175 | wsrep_provider_options = "gcache.size=64M;base_host=10.1.2.102; base_port=4567; cert.log_conflicts=no;etc=etc;" | ||
1275 | 175 | 176 | ||
1276 | 176 | [mysql.server] | 177 | [mysql.server] |
1277 | 177 | user = mysql | 178 | user = mysql |
1278 | 178 | 179 | ||
1279 | === modified file 't/lib/bash/report_system_info.sh' | |||
1280 | --- t/lib/bash/report_system_info.sh 2012-08-24 22:39:58 +0000 | |||
1281 | +++ t/lib/bash/report_system_info.sh 2014-09-29 19:43:03 +0000 | |||
1282 | @@ -1,6 +1,6 @@ | |||
1283 | 1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
1284 | 2 | 2 | ||
1286 | 3 | plan 53 | 3 | plan 54 |
1287 | 4 | 4 | ||
1288 | 5 | . "$LIB_DIR/alt_cmds.sh" | 5 | . "$LIB_DIR/alt_cmds.sh" |
1289 | 6 | . "$LIB_DIR/log_warn_die.sh" | 6 | . "$LIB_DIR/log_warn_die.sh" |
1290 | @@ -1040,6 +1040,16 @@ | |||
1291 | 1040 | parse_dmidecode_mem_devices "$samples/dmidecode-005.txt" > "$PT_TMPDIR/got" | 1040 | parse_dmidecode_mem_devices "$samples/dmidecode-005.txt" > "$PT_TMPDIR/got" |
1292 | 1041 | no_diff "$PT_TMPDIR/got" "$PT_TMPDIR/expected" "dmidecode-005.txt" | 1041 | no_diff "$PT_TMPDIR/got" "$PT_TMPDIR/expected" "dmidecode-005.txt" |
1293 | 1042 | 1042 | ||
1294 | 1043 | cat <<EOF > "$PT_TMPDIR/expected" | ||
1295 | 1044 | Locator Size Speed Form Factor Type Type Detail | ||
1296 | 1045 | ========= ======== ================= ============= ============= =========== | ||
1297 | 1046 | DIMM 1 8192 MB 1600 MHz SODIMM DDR3 Synchronous | ||
1298 | 1047 | DIMM 2 8192 MB 1600 MHz SODIMM DDR3 Synchronous | ||
1299 | 1048 | EOF | ||
1300 | 1049 | parse_dmidecode_mem_devices "$samples/dmidecode-006.txt" > "$PT_TMPDIR/got" | ||
1301 | 1050 | no_diff "$PT_TMPDIR/got" "$PT_TMPDIR/expected" "dmidecode-006.txt" | ||
1302 | 1051 | |||
1303 | 1052 | |||
1304 | 1043 | # parse_arcconf | 1053 | # parse_arcconf |
1305 | 1044 | 1054 | ||
1306 | 1045 | cat <<EOF > "$PT_TMPDIR/expected" | 1055 | cat <<EOF > "$PT_TMPDIR/expected" |
1307 | 1046 | 1056 | ||
1308 | === modified file 't/pt-duplicate-key-checker/standard_options.t' | |||
1309 | --- t/pt-duplicate-key-checker/standard_options.t 2013-12-12 02:17:16 +0000 | |||
1310 | +++ t/pt-duplicate-key-checker/standard_options.t 2014-09-29 19:43:03 +0000 | |||
1311 | @@ -28,7 +28,32 @@ | |||
1312 | 28 | 28 | ||
1313 | 29 | diag(`touch $pid_file`); | 29 | diag(`touch $pid_file`); |
1314 | 30 | 30 | ||
1316 | 31 | $output = `$cmd -d issue_295 --pid $pid_file 2>&1`; | 31 | |
1317 | 32 | # to test this issue I must set a timeout in case the command doesn't come back | ||
1318 | 33 | |||
1319 | 34 | eval { | ||
1320 | 35 | # we define an alarm signal handler | ||
1321 | 36 | local $SIG{'ALRM'} = sub { die "timed out\n" }; | ||
1322 | 37 | |||
1323 | 38 | # and set the alarm 'clock' to 5 seconds | ||
1324 | 39 | alarm(5); | ||
1325 | 40 | |||
1326 | 41 | # here's the actual command. correct bahaviour is to die with messsage "PID file <pid_file> exists" | ||
1327 | 42 | # Incorrect behavior is anything else, including not returning control after 5 seconds | ||
1328 | 43 | $output = `$cmd -d issue_295 --pid $pid_file 2>&1`; | ||
1329 | 44 | |||
1330 | 45 | }; | ||
1331 | 46 | |||
1332 | 47 | if ($@) { | ||
1333 | 48 | if ($@ eq "timed out\n") { | ||
1334 | 49 | print "I timed out\n"; | ||
1335 | 50 | } | ||
1336 | 51 | else { | ||
1337 | 52 | print "Something else went wrong: $@\n"; | ||
1338 | 53 | } | ||
1339 | 54 | } | ||
1340 | 55 | |||
1341 | 56 | |||
1342 | 32 | like( | 57 | like( |
1343 | 33 | $output, | 58 | $output, |
1344 | 34 | qr{PID file $pid_file exists}, | 59 | qr{PID file $pid_file exists}, |
1345 | 35 | 60 | ||
1346 | === modified file 't/pt-fifo-split/pt-fifo-split.t' | |||
1347 | --- t/pt-fifo-split/pt-fifo-split.t 2013-03-04 19:06:34 +0000 | |||
1348 | +++ t/pt-fifo-split/pt-fifo-split.t 2014-09-29 19:43:03 +0000 | |||
1349 | @@ -47,6 +47,12 @@ | |||
1350 | 47 | my ($n_reads) = @_; | 47 | my ($n_reads) = @_; |
1351 | 48 | my $last_inode = 0; | 48 | my $last_inode = 0; |
1352 | 49 | my @data; | 49 | my @data; |
1353 | 50 | |||
1354 | 51 | # This test still freezes on some centos systems, | ||
1355 | 52 | # so we're going to bluntly sleep for a few secs to avoid deadlock | ||
1356 | 53 | # TODO: figure out if there is a proper way to do this. | ||
1357 | 54 | sleep(3); | ||
1358 | 55 | |||
1359 | 50 | for (1..$n_reads) { | 56 | for (1..$n_reads) { |
1360 | 51 | PerconaTest::wait_until(sub { | 57 | PerconaTest::wait_until(sub { |
1361 | 52 | my $inode; | 58 | my $inode; |
1362 | 53 | 59 | ||
1363 | === modified file 't/pt-mysql-summary/samples/my.cnf-001.txt' | |||
1364 | --- t/pt-mysql-summary/samples/my.cnf-001.txt 2011-07-01 16:29:50 +0000 | |||
1365 | +++ t/pt-mysql-summary/samples/my.cnf-001.txt 2014-09-29 19:43:03 +0000 | |||
1366 | @@ -24,6 +24,8 @@ | |||
1367 | 24 | server-id = 1 | 24 | server-id = 1 |
1368 | 25 | log-bin=sl1-bin | 25 | log-bin=sl1-bin |
1369 | 26 | 26 | ||
1370 | 27 | wsrep_provider_options = "gcache.size=64M;base_host=10.1.2.102; base_port=4567; cert.log_conflicts=no;etc=etc;" | ||
1371 | 28 | |||
1372 | 27 | [mysql.server] | 29 | [mysql.server] |
1373 | 28 | user=mysql | 30 | user=mysql |
1374 | 29 | ####basedir=/var/lib | 31 | ####basedir=/var/lib |
1375 | 30 | 32 | ||
1376 | === modified file 't/pt-query-digest/samples/slow008_report.txt' | |||
1377 | --- t/pt-query-digest/samples/slow008_report.txt 2013-01-11 16:45:20 +0000 | |||
1378 | +++ t/pt-query-digest/samples/slow008_report.txt 2014-09-29 19:43:03 +0000 | |||
1379 | @@ -12,7 +12,7 @@ | |||
1380 | 12 | # Query size 43 31 31 31 31 31 0 31 | 12 | # Query size 43 31 31 31 31 31 0 31 |
1381 | 13 | # String: | 13 | # String: |
1382 | 14 | # Databases db2 | 14 | # Databases db2 |
1384 | 15 | # Hosts | 15 | # Hosts 1.2.3.8 |
1385 | 16 | # Users meow | 16 | # Users meow |
1386 | 17 | # Query_time distribution | 17 | # Query_time distribution |
1387 | 18 | # 1us | 18 | # 1us |
1388 | @@ -42,7 +42,7 @@ | |||
1389 | 42 | # Query size 19 14 14 14 14 14 0 14 | 42 | # Query size 19 14 14 14 14 14 0 14 |
1390 | 43 | # String: | 43 | # String: |
1391 | 44 | # Databases db | 44 | # Databases db |
1393 | 45 | # Hosts | 45 | # Hosts 1.2.3.8 |
1394 | 46 | # Users meow | 46 | # Users meow |
1395 | 47 | # Query_time distribution | 47 | # Query_time distribution |
1396 | 48 | # 1us | 48 | # 1us |
1397 | @@ -68,7 +68,7 @@ | |||
1398 | 68 | # Query size 37 27 27 27 27 27 0 27 | 68 | # Query size 37 27 27 27 27 27 0 27 |
1399 | 69 | # String: | 69 | # String: |
1400 | 70 | # Databases db1 | 70 | # Databases db1 |
1402 | 71 | # Hosts | 71 | # Hosts 1.2.3.8 |
1403 | 72 | # Users meow | 72 | # Users meow |
1404 | 73 | # Query_time distribution | 73 | # Query_time distribution |
1405 | 74 | # 1us ################################################################ | 74 | # 1us ################################################################ |
1406 | 75 | 75 | ||
1407 | === modified file 't/pt-query-digest/samples/slow011_report.txt' | |||
1408 | --- t/pt-query-digest/samples/slow011_report.txt 2013-01-11 16:45:20 +0000 | |||
1409 | +++ t/pt-query-digest/samples/slow011_report.txt 2014-09-29 19:43:03 +0000 | |||
1410 | @@ -12,7 +12,7 @@ | |||
1411 | 12 | # Query size 65 54 27 27 27 27 0 27 | 12 | # Query size 65 54 27 27 27 27 0 27 |
1412 | 13 | # String: | 13 | # String: |
1413 | 14 | # Databases db1 (1/50%), db2 (1/50%) | 14 | # Databases db1 (1/50%), db2 (1/50%) |
1415 | 15 | # Hosts | 15 | # Hosts 1.2.3.8 |
1416 | 16 | # Users meow | 16 | # Users meow |
1417 | 17 | # Query_time distribution | 17 | # Query_time distribution |
1418 | 18 | # 1us ################################################################ | 18 | # 1us ################################################################ |
1419 | @@ -38,7 +38,7 @@ | |||
1420 | 38 | # Query size 34 28 14 14 14 14 0 14 | 38 | # Query size 34 28 14 14 14 14 0 14 |
1421 | 39 | # String: | 39 | # String: |
1422 | 40 | # Databases db | 40 | # Databases db |
1424 | 41 | # Hosts | 41 | # Hosts 1.2.3.8 |
1425 | 42 | # Users meow | 42 | # Users meow |
1426 | 43 | # Query_time distribution | 43 | # Query_time distribution |
1427 | 44 | # 1us | 44 | # 1us |
1428 | 45 | 45 | ||
1429 | === modified file 't/pt-query-digest/samples/slow013_report.txt' | |||
1430 | --- t/pt-query-digest/samples/slow013_report.txt 2013-01-11 16:45:20 +0000 | |||
1431 | +++ t/pt-query-digest/samples/slow013_report.txt 2014-09-29 19:43:03 +0000 | |||
1432 | @@ -13,7 +13,7 @@ | |||
1433 | 13 | # Query size 14 11 11 11 11 11 0 11 | 13 | # Query size 14 11 11 11 11 11 0 11 |
1434 | 14 | # String: | 14 | # String: |
1435 | 15 | # Databases test | 15 | # Databases test |
1437 | 16 | # Hosts | 16 | # Hosts 10.1.12.201 |
1438 | 17 | # Users mytopuser | 17 | # Users mytopuser |
1439 | 18 | # Query_time distribution | 18 | # Query_time distribution |
1440 | 19 | # 1us | 19 | # 1us |
1441 | @@ -40,7 +40,7 @@ | |||
1442 | 40 | # Query size 42 32 16 16 16 16 0 16 | 40 | # Query size 42 32 16 16 16 16 0 16 |
1443 | 41 | # String: | 41 | # String: |
1444 | 42 | # Databases abc | 42 | # Databases abc |
1446 | 43 | # Hosts | 43 | # Hosts 10.1.250.19 |
1447 | 44 | # Users foo_app | 44 | # Users foo_app |
1448 | 45 | # Query_time distribution | 45 | # Query_time distribution |
1449 | 46 | # 1us | 46 | # 1us |
1450 | @@ -67,7 +67,7 @@ | |||
1451 | 67 | # Query size 7 6 6 6 6 6 0 6 | 67 | # Query size 7 6 6 6 6 6 0 6 |
1452 | 68 | # String: | 68 | # String: |
1453 | 69 | # Databases abc | 69 | # Databases abc |
1455 | 70 | # Hosts | 70 | # Hosts 10.1.250.19 |
1456 | 71 | # Users foo_app | 71 | # Users foo_app |
1457 | 72 | # Query_time distribution | 72 | # Query_time distribution |
1458 | 73 | # 1us | 73 | # 1us |
1459 | @@ -94,7 +94,7 @@ | |||
1460 | 94 | # Query size 35 27 27 27 27 27 0 27 | 94 | # Query size 35 27 27 27 27 27 0 27 |
1461 | 95 | # String: | 95 | # String: |
1462 | 96 | # Databases test | 96 | # Databases test |
1464 | 97 | # Hosts | 97 | # Hosts 10.1.12.201 |
1465 | 98 | # Users mytopuser | 98 | # Users mytopuser |
1466 | 99 | # Query_time distribution | 99 | # Query_time distribution |
1467 | 100 | # 1us ################################################################ | 100 | # 1us ################################################################ |
1468 | 101 | 101 | ||
1469 | === modified file 't/pt-query-digest/samples/slow013_report_fingerprint_user.txt' | |||
1470 | --- t/pt-query-digest/samples/slow013_report_fingerprint_user.txt 2013-01-11 16:45:20 +0000 | |||
1471 | +++ t/pt-query-digest/samples/slow013_report_fingerprint_user.txt 2014-09-29 19:43:03 +0000 | |||
1472 | @@ -27,7 +27,7 @@ | |||
1473 | 27 | # Query size 14 11 11 11 11 11 0 11 | 27 | # Query size 14 11 11 11 11 11 0 11 |
1474 | 28 | # String: | 28 | # String: |
1475 | 29 | # Databases test | 29 | # Databases test |
1477 | 30 | # Hosts | 30 | # Hosts 10.1.12.201 |
1478 | 31 | # Users mytopuser | 31 | # Users mytopuser |
1479 | 32 | # Query_time distribution | 32 | # Query_time distribution |
1480 | 33 | # 1us | 33 | # 1us |
1481 | @@ -58,7 +58,7 @@ | |||
1482 | 58 | # Query size 50 38 11 27 19 27 11.31 19 | 58 | # Query size 50 38 11 27 19 27 11.31 19 |
1483 | 59 | # String: | 59 | # String: |
1484 | 60 | # Databases test | 60 | # Databases test |
1486 | 61 | # Hosts | 61 | # Hosts 10.1.12.201 |
1487 | 62 | # Query_time distribution | 62 | # Query_time distribution |
1488 | 63 | # 1us ################################################################ | 63 | # 1us ################################################################ |
1489 | 64 | # 10us | 64 | # 10us |
1490 | 65 | 65 | ||
1491 | === modified file 't/pt-query-digest/samples/slow013_report_limit.txt' | |||
1492 | --- t/pt-query-digest/samples/slow013_report_limit.txt 2013-01-11 16:45:20 +0000 | |||
1493 | +++ t/pt-query-digest/samples/slow013_report_limit.txt 2014-09-29 19:43:03 +0000 | |||
1494 | @@ -13,7 +13,7 @@ | |||
1495 | 13 | # Query size 14 11 11 11 11 11 0 11 | 13 | # Query size 14 11 11 11 11 11 0 11 |
1496 | 14 | # String: | 14 | # String: |
1497 | 15 | # Databases test | 15 | # Databases test |
1499 | 16 | # Hosts | 16 | # Hosts 10.1.12.201 |
1500 | 17 | # Users mytopuser | 17 | # Users mytopuser |
1501 | 18 | # Query_time distribution | 18 | # Query_time distribution |
1502 | 19 | # 1us | 19 | # 1us |
1503 | 20 | 20 | ||
1504 | === modified file 't/pt-query-digest/samples/slow013_report_outliers.txt' | |||
1505 | --- t/pt-query-digest/samples/slow013_report_outliers.txt 2013-01-11 16:45:20 +0000 | |||
1506 | +++ t/pt-query-digest/samples/slow013_report_outliers.txt 2014-09-29 19:43:03 +0000 | |||
1507 | @@ -17,7 +17,7 @@ | |||
1508 | 17 | # Query size 50 38 11 27 19 27 11.31 19 | 17 | # Query size 50 38 11 27 19 27 11.31 19 |
1509 | 18 | # String: | 18 | # String: |
1510 | 19 | # Databases test | 19 | # Databases test |
1512 | 20 | # Hosts | 20 | # Hosts 10.1.12.201 |
1513 | 21 | # Query_time distribution | 21 | # Query_time distribution |
1514 | 22 | # 1us ################################################################ | 22 | # 1us ################################################################ |
1515 | 23 | # 10us | 23 | # 10us |
1516 | @@ -43,7 +43,7 @@ | |||
1517 | 43 | # Query size 50 38 6 16 12.67 15.25 4.48 15.25 | 43 | # Query size 50 38 6 16 12.67 15.25 4.48 15.25 |
1518 | 44 | # String: | 44 | # String: |
1519 | 45 | # Databases abc | 45 | # Databases abc |
1521 | 46 | # Hosts | 46 | # Hosts 10.1.250.19 |
1522 | 47 | # Query_time distribution | 47 | # Query_time distribution |
1523 | 48 | # 1us | 48 | # 1us |
1524 | 49 | # 10us ################################################################ | 49 | # 10us ################################################################ |
1525 | 50 | 50 | ||
1526 | === modified file 't/pt-query-digest/samples/slow013_report_user.txt' | |||
1527 | --- t/pt-query-digest/samples/slow013_report_user.txt 2013-01-11 16:45:20 +0000 | |||
1528 | +++ t/pt-query-digest/samples/slow013_report_user.txt 2014-09-29 19:43:03 +0000 | |||
1529 | @@ -17,7 +17,7 @@ | |||
1530 | 17 | # Query size 50 38 11 27 19 27 11.31 19 | 17 | # Query size 50 38 11 27 19 27 11.31 19 |
1531 | 18 | # String: | 18 | # String: |
1532 | 19 | # Databases test | 19 | # Databases test |
1534 | 20 | # Hosts | 20 | # Hosts 10.1.12.201 |
1535 | 21 | # Query_time distribution | 21 | # Query_time distribution |
1536 | 22 | # 1us ################################################################ | 22 | # 1us ################################################################ |
1537 | 23 | # 10us | 23 | # 10us |
1538 | @@ -43,7 +43,7 @@ | |||
1539 | 43 | # Query size 50 38 6 16 12.67 15.25 4.48 15.25 | 43 | # Query size 50 38 6 16 12.67 15.25 4.48 15.25 |
1540 | 44 | # String: | 44 | # String: |
1541 | 45 | # Databases abc | 45 | # Databases abc |
1543 | 46 | # Hosts | 46 | # Hosts 10.1.250.19 |
1544 | 47 | # Query_time distribution | 47 | # Query_time distribution |
1545 | 48 | # 1us | 48 | # 1us |
1546 | 49 | # 10us ################################################################ | 49 | # 10us ################################################################ |
1547 | 50 | 50 | ||
1548 | === modified file 't/pt-query-digest/samples/slow019_report.txt' | |||
1549 | --- t/pt-query-digest/samples/slow019_report.txt 2013-01-11 16:45:20 +0000 | |||
1550 | +++ t/pt-query-digest/samples/slow019_report.txt 2014-09-29 19:43:03 +0000 | |||
1551 | @@ -12,7 +12,7 @@ | |||
1552 | 12 | # Query size 79 54 27 27 27 27 0 27 | 12 | # Query size 79 54 27 27 27 27 0 27 |
1553 | 13 | # String: | 13 | # String: |
1554 | 14 | # Databases db1 (1/50%), db2 (1/50%) | 14 | # Databases db1 (1/50%), db2 (1/50%) |
1556 | 15 | # Hosts | 15 | # Hosts 1.2.3.8 |
1557 | 16 | # Users meow | 16 | # Users meow |
1558 | 17 | # Query_time distribution | 17 | # Query_time distribution |
1559 | 18 | # 1us ################################################################ | 18 | # 1us ################################################################ |
1560 | @@ -38,7 +38,7 @@ | |||
1561 | 38 | # Query size 20 14 14 14 14 14 0 14 | 38 | # Query size 20 14 14 14 14 14 0 14 |
1562 | 39 | # String: | 39 | # String: |
1563 | 40 | # Databases db | 40 | # Databases db |
1565 | 41 | # Hosts | 41 | # Hosts 1.2.3.8 |
1566 | 42 | # Users meow | 42 | # Users meow |
1567 | 43 | # Query_time distribution | 43 | # Query_time distribution |
1568 | 44 | # 1us | 44 | # 1us |
1569 | 45 | 45 | ||
1570 | === modified file 't/pt-query-digest/samples/slow055.txt' | |||
1571 | --- t/pt-query-digest/samples/slow055.txt 2013-01-11 16:45:20 +0000 | |||
1572 | +++ t/pt-query-digest/samples/slow055.txt 2014-09-29 19:43:03 +0000 | |||
1573 | @@ -15,7 +15,7 @@ | |||
1574 | 15 | # Rows examine 0 0 0 0 0 0 0 0 | 15 | # Rows examine 0 0 0 0 0 0 0 0 |
1575 | 16 | # Query size 100 72 14 31 24 30.19 6.95 26.08 | 16 | # Query size 100 72 14 31 24 30.19 6.95 26.08 |
1576 | 17 | # String: | 17 | # String: |
1578 | 18 | # Hosts | 18 | # Hosts 1.2.3.8 |
1579 | 19 | # Users meow | 19 | # Users meow |
1580 | 20 | # Query_time distribution | 20 | # Query_time distribution |
1581 | 21 | # 1us ################################################################ | 21 | # 1us ################################################################ |
1582 | 22 | 22 | ||
1583 | === modified file 't/pt-query-digest/samples/slow056.txt' | |||
1584 | --- t/pt-query-digest/samples/slow056.txt 2013-01-11 16:45:20 +0000 | |||
1585 | +++ t/pt-query-digest/samples/slow056.txt 2014-09-29 19:43:03 +0000 | |||
1586 | @@ -15,7 +15,7 @@ | |||
1587 | 15 | # Query size 100 39 39 39 39 39 0 39 | 15 | # Query size 100 39 39 39 39 39 0 39 |
1588 | 16 | # String: | 16 | # String: |
1589 | 17 | # Databases test_db | 17 | # Databases test_db |
1591 | 18 | # Hosts | 18 | # Hosts 127.0.0.1 |
1592 | 19 | # Last errno 0 | 19 | # Last errno 0 |
1593 | 20 | # Users root | 20 | # Users root |
1594 | 21 | # Query_time distribution | 21 | # Query_time distribution |
1595 | @@ -51,7 +51,7 @@ | |||
1596 | 51 | # Query size 0 0 0 0 0 0 0 0 | 51 | # Query size 0 0 0 0 0 0 0 0 |
1597 | 52 | # String: | 52 | # String: |
1598 | 53 | # Databases test_db | 53 | # Databases test_db |
1600 | 54 | # Hosts | 54 | # Hosts 127.0.0.1 |
1601 | 55 | # Last errno 0 | 55 | # Last errno 0 |
1602 | 56 | # Users root | 56 | # Users root |
1603 | 57 | # Query_time distribution | 57 | # Query_time distribution |
1604 | 58 | 58 | ||
1605 | === modified file 't/pt-query-digest/samples/slow057.txt' | |||
1606 | --- t/pt-query-digest/samples/slow057.txt 2013-06-26 23:16:15 +0000 | |||
1607 | +++ t/pt-query-digest/samples/slow057.txt 2014-09-29 19:43:03 +0000 | |||
1608 | @@ -15,7 +15,7 @@ | |||
1609 | 15 | # Rows examine 0 0 0 0 0 0 0 0 | 15 | # Rows examine 0 0 0 0 0 0 0 0 |
1610 | 16 | # Query size 100 82 14 27 20.50 26.08 6.12 26.08 | 16 | # Query size 100 82 14 27 20.50 26.08 6.12 26.08 |
1611 | 17 | # String: | 17 | # String: |
1613 | 18 | # Hosts | 18 | # Hosts 1.2.3.8 |
1614 | 19 | # Users meow | 19 | # Users meow |
1615 | 20 | # Query_time distribution | 20 | # Query_time distribution |
1616 | 21 | # 1us ################################ | 21 | # 1us ################################ |
1617 | 22 | 22 | ||
1618 | === modified file 't/pt-query-digest/samples/slow058.txt' | |||
1619 | --- t/pt-query-digest/samples/slow058.txt 2013-08-03 19:17:05 +0000 | |||
1620 | +++ t/pt-query-digest/samples/slow058.txt 2014-09-29 19:43:03 +0000 | |||
1621 | @@ -12,7 +12,7 @@ | |||
1622 | 12 | # Query size 24 52 26 26 26 26 0 26 | 12 | # Query size 24 52 26 26 26 26 0 26 |
1623 | 13 | # String: | 13 | # String: |
1624 | 14 | # Databases db | 14 | # Databases db |
1626 | 15 | # Hosts | 15 | # Hosts 1.2.3.8 |
1627 | 16 | # Users meow | 16 | # Users meow |
1628 | 17 | # Query_time distribution | 17 | # Query_time distribution |
1629 | 18 | # 1us | 18 | # 1us |
1630 | @@ -41,7 +41,7 @@ | |||
1631 | 41 | # Query size 25 54 27 27 27 27 0 27 | 41 | # Query size 25 54 27 27 27 27 0 27 |
1632 | 42 | # String: | 42 | # String: |
1633 | 43 | # Databases db | 43 | # Databases db |
1635 | 44 | # Hosts | 44 | # Hosts 1.2.3.8 |
1636 | 45 | # Users meow | 45 | # Users meow |
1637 | 46 | # Query_time distribution | 46 | # Query_time distribution |
1638 | 47 | # 1us | 47 | # 1us |
1639 | @@ -70,7 +70,7 @@ | |||
1640 | 70 | # Query size 50 108 54 54 54 54 0 54 | 70 | # Query size 50 108 54 54 54 54 0 54 |
1641 | 71 | # String: | 71 | # String: |
1642 | 72 | # Databases db | 72 | # Databases db |
1644 | 73 | # Hosts | 73 | # Hosts 1.2.3.8 |
1645 | 74 | # Users meow | 74 | # Users meow |
1646 | 75 | # Query_time distribution | 75 | # Query_time distribution |
1647 | 76 | # 1us ################################################################ | 76 | # 1us ################################################################ |
1648 | 77 | 77 | ||
1649 | === added file 't/pt-summary/samples/dmidecode-006.txt' | |||
1650 | --- t/pt-summary/samples/dmidecode-006.txt 1970-01-01 00:00:00 +0000 | |||
1651 | +++ t/pt-summary/samples/dmidecode-006.txt 2014-09-29 19:43:03 +0000 | |||
1652 | @@ -0,0 +1,920 @@ | |||
1653 | 1 | # dmidecode 2.12 | ||
1654 | 2 | # SMBIOS entry point at 0x000f04d0 | ||
1655 | 3 | SMBIOS 2.8 present. | ||
1656 | 4 | 84 structures occupying 3168 bytes. | ||
1657 | 5 | Table at 0x000EC170. | ||
1658 | 6 | |||
1659 | 7 | Handle 0x0000, DMI type 0, 24 bytes | ||
1660 | 8 | BIOS Information | ||
1661 | 9 | Vendor: Intel Corp. | ||
1662 | 10 | Version: WYLPT10H.86A.0027.2014.0710.1904 | ||
1663 | 11 | Release Date: 07/10/2014 | ||
1664 | 12 | Address: 0xF0000 | ||
1665 | 13 | Runtime Size: 64 kB | ||
1666 | 14 | ROM Size: 6656 kB | ||
1667 | 15 | Characteristics: | ||
1668 | 16 | PCI is supported | ||
1669 | 17 | BIOS is upgradeable | ||
1670 | 18 | BIOS shadowing is allowed | ||
1671 | 19 | Boot from CD is supported | ||
1672 | 20 | Selectable boot is supported | ||
1673 | 21 | BIOS ROM is socketed | ||
1674 | 22 | EDD is supported | ||
1675 | 23 | 5.25"/1.2 MB floppy services are supported (int 13h) | ||
1676 | 24 | 3.5"/720 kB floppy services are supported (int 13h) | ||
1677 | 25 | 3.5"/2.88 MB floppy services are supported (int 13h) | ||
1678 | 26 | Print screen service is supported (int 5h) | ||
1679 | 27 | Serial services are supported (int 14h) | ||
1680 | 28 | Printer services are supported (int 17h) | ||
1681 | 29 | ACPI is supported | ||
1682 | 30 | USB legacy is supported | ||
1683 | 31 | BIOS boot specification is supported | ||
1684 | 32 | Targeted content distribution is supported | ||
1685 | 33 | UEFI is supported | ||
1686 | 34 | BIOS Revision: 4.6 | ||
1687 | 35 | |||
1688 | 36 | Handle 0x0001, DMI type 1, 27 bytes | ||
1689 | 37 | System Information | ||
1690 | 38 | Manufacturer: | ||
1691 | 39 | Product Name: | ||
1692 | 40 | Version: | ||
1693 | 41 | Serial Number: | ||
1694 | 42 | UUID: CF181A80-34D4-11E1-BA8E-C03FD5602091 | ||
1695 | 43 | Wake-up Type: Power Switch | ||
1696 | 44 | SKU Number: | ||
1697 | 45 | Family: | ||
1698 | 46 | |||
1699 | 47 | Handle 0x0002, DMI type 2, 15 bytes | ||
1700 | 48 | Base Board Information | ||
1701 | 49 | Manufacturer: Intel Corporation | ||
1702 | 50 | Product Name: D34010WYK | ||
1703 | 51 | Version: H14771-303 | ||
1704 | 52 | Serial Number: GEWY401001F8 | ||
1705 | 53 | Asset Tag: | ||
1706 | 54 | Features: | ||
1707 | 55 | Board is a hosting board | ||
1708 | 56 | Board is replaceable | ||
1709 | 57 | Location In Chassis: To be filled by O.E.M. | ||
1710 | 58 | Chassis Handle: 0x0003 | ||
1711 | 59 | Type: Motherboard | ||
1712 | 60 | Contained Object Handles: 0 | ||
1713 | 61 | |||
1714 | 62 | Handle 0x0003, DMI type 3, 25 bytes | ||
1715 | 63 | Chassis Information | ||
1716 | 64 | Manufacturer: | ||
1717 | 65 | Type: Desktop | ||
1718 | 66 | Lock: Not Present | ||
1719 | 67 | Version: | ||
1720 | 68 | Serial Number: | ||
1721 | 69 | Asset Tag: | ||
1722 | 70 | Boot-up State: Safe | ||
1723 | 71 | Power Supply State: Safe | ||
1724 | 72 | Thermal State: Safe | ||
1725 | 73 | Security Status: None | ||
1726 | 74 | OEM Information: 0x00000000 | ||
1727 | 75 | Height: Unspecified | ||
1728 | 76 | Number Of Power Cords: 1 | ||
1729 | 77 | Contained Elements: 1 | ||
1730 | 78 | <OUT OF SPEC> (0) | ||
1731 | 79 | SKU Number: To be filled by O.E.M. | ||
1732 | 80 | |||
1733 | 81 | Handle 0x0004, DMI type 8, 9 bytes | ||
1734 | 82 | Port Connector Information | ||
1735 | 83 | Internal Reference Designator: J1A1 | ||
1736 | 84 | Internal Connector Type: None | ||
1737 | 85 | External Reference Designator: PS2Mouse | ||
1738 | 86 | External Connector Type: PS/2 | ||
1739 | 87 | Port Type: Mouse Port | ||
1740 | 88 | |||
1741 | 89 | Handle 0x0005, DMI type 8, 9 bytes | ||
1742 | 90 | Port Connector Information | ||
1743 | 91 | Internal Reference Designator: J1A1 | ||
1744 | 92 | Internal Connector Type: None | ||
1745 | 93 | External Reference Designator: Keyboard | ||
1746 | 94 | External Connector Type: PS/2 | ||
1747 | 95 | Port Type: Keyboard Port | ||
1748 | 96 | |||
1749 | 97 | Handle 0x0006, DMI type 8, 9 bytes | ||
1750 | 98 | Port Connector Information | ||
1751 | 99 | Internal Reference Designator: J2A1 | ||
1752 | 100 | Internal Connector Type: None | ||
1753 | 101 | External Reference Designator: TV Out | ||
1754 | 102 | External Connector Type: Mini Centronics Type-14 | ||
1755 | 103 | Port Type: Other | ||
1756 | 104 | |||
1757 | 105 | Handle 0x0007, DMI type 8, 9 bytes | ||
1758 | 106 | Port Connector Information | ||
1759 | 107 | Internal Reference Designator: J2A2A | ||
1760 | 108 | Internal Connector Type: None | ||
1761 | 109 | External Reference Designator: COM A | ||
1762 | 110 | External Connector Type: DB-9 male | ||
1763 | 111 | Port Type: Serial Port 16550A Compatible | ||
1764 | 112 | |||
1765 | 113 | Handle 0x0008, DMI type 8, 9 bytes | ||
1766 | 114 | Port Connector Information | ||
1767 | 115 | Internal Reference Designator: J2A2B | ||
1768 | 116 | Internal Connector Type: None | ||
1769 | 117 | External Reference Designator: Video | ||
1770 | 118 | External Connector Type: DB-15 female | ||
1771 | 119 | Port Type: Video Port | ||
1772 | 120 | |||
1773 | 121 | Handle 0x0009, DMI type 8, 9 bytes | ||
1774 | 122 | Port Connector Information | ||
1775 | 123 | Internal Reference Designator: J3A1 | ||
1776 | 124 | Internal Connector Type: None | ||
1777 | 125 | External Reference Designator: USB1 | ||
1778 | 126 | External Connector Type: Access Bus (USB) | ||
1779 | 127 | Port Type: USB | ||
1780 | 128 | |||
1781 | 129 | Handle 0x000A, DMI type 8, 9 bytes | ||
1782 | 130 | Port Connector Information | ||
1783 | 131 | Internal Reference Designator: J3A1 | ||
1784 | 132 | Internal Connector Type: None | ||
1785 | 133 | External Reference Designator: USB2 | ||
1786 | 134 | External Connector Type: Access Bus (USB) | ||
1787 | 135 | Port Type: USB | ||
1788 | 136 | |||
1789 | 137 | Handle 0x000B, DMI type 8, 9 bytes | ||
1790 | 138 | Port Connector Information | ||
1791 | 139 | Internal Reference Designator: J3A1 | ||
1792 | 140 | Internal Connector Type: None | ||
1793 | 141 | External Reference Designator: USB3 | ||
1794 | 142 | External Connector Type: Access Bus (USB) | ||
1795 | 143 | Port Type: USB | ||
1796 | 144 | |||
1797 | 145 | Handle 0x000C, DMI type 8, 9 bytes | ||
1798 | 146 | Port Connector Information | ||
1799 | 147 | Internal Reference Designator: J9A1 - TPM HDR | ||
1800 | 148 | Internal Connector Type: Other | ||
1801 | 149 | External Reference Designator: Not Specified | ||
1802 | 150 | External Connector Type: None | ||
1803 | 151 | Port Type: Other | ||
1804 | 152 | |||
1805 | 153 | Handle 0x000D, DMI type 8, 9 bytes | ||
1806 | 154 | Port Connector Information | ||
1807 | 155 | Internal Reference Designator: J9C1 - PCIE DOCKING CONN | ||
1808 | 156 | Internal Connector Type: Other | ||
1809 | 157 | External Reference Designator: Not Specified | ||
1810 | 158 | External Connector Type: None | ||
1811 | 159 | Port Type: Other | ||
1812 | 160 | |||
1813 | 161 | Handle 0x000E, DMI type 8, 9 bytes | ||
1814 | 162 | Port Connector Information | ||
1815 | 163 | Internal Reference Designator: J2B3 - CPU FAN | ||
1816 | 164 | Internal Connector Type: Other | ||
1817 | 165 | External Reference Designator: Not Specified | ||
1818 | 166 | External Connector Type: None | ||
1819 | 167 | Port Type: Other | ||
1820 | 168 | |||
1821 | 169 | Handle 0x000F, DMI type 8, 9 bytes | ||
1822 | 170 | Port Connector Information | ||
1823 | 171 | Internal Reference Designator: J6C2 - EXT HDMI | ||
1824 | 172 | Internal Connector Type: Other | ||
1825 | 173 | External Reference Designator: Not Specified | ||
1826 | 174 | External Connector Type: None | ||
1827 | 175 | Port Type: Other | ||
1828 | 176 | |||
1829 | 177 | Handle 0x0010, DMI type 8, 9 bytes | ||
1830 | 178 | Port Connector Information | ||
1831 | 179 | Internal Reference Designator: J3C1 - GMCH FAN | ||
1832 | 180 | Internal Connector Type: Other | ||
1833 | 181 | External Reference Designator: Not Specified | ||
1834 | 182 | External Connector Type: None | ||
1835 | 183 | Port Type: Other | ||
1836 | 184 | |||
1837 | 185 | Handle 0x0011, DMI type 8, 9 bytes | ||
1838 | 186 | Port Connector Information | ||
1839 | 187 | Internal Reference Designator: J1D1 - ITP | ||
1840 | 188 | Internal Connector Type: Other | ||
1841 | 189 | External Reference Designator: Not Specified | ||
1842 | 190 | External Connector Type: None | ||
1843 | 191 | Port Type: Other | ||
1844 | 192 | |||
1845 | 193 | Handle 0x0012, DMI type 8, 9 bytes | ||
1846 | 194 | Port Connector Information | ||
1847 | 195 | Internal Reference Designator: J9E2 - MDC INTPSR | ||
1848 | 196 | Internal Connector Type: Other | ||
1849 | 197 | External Reference Designator: Not Specified | ||
1850 | 198 | External Connector Type: None | ||
1851 | 199 | Port Type: Other | ||
1852 | 200 | |||
1853 | 201 | Handle 0x0013, DMI type 8, 9 bytes | ||
1854 | 202 | Port Connector Information | ||
1855 | 203 | Internal Reference Designator: J9E4 - MDC INTPSR | ||
1856 | 204 | Internal Connector Type: Other | ||
1857 | 205 | External Reference Designator: Not Specified | ||
1858 | 206 | External Connector Type: None | ||
1859 | 207 | Port Type: Other | ||
1860 | 208 | |||
1861 | 209 | Handle 0x0014, DMI type 8, 9 bytes | ||
1862 | 210 | Port Connector Information | ||
1863 | 211 | Internal Reference Designator: J9E3 - LPC HOT DOCKING | ||
1864 | 212 | Internal Connector Type: Other | ||
1865 | 213 | External Reference Designator: Not Specified | ||
1866 | 214 | External Connector Type: None | ||
1867 | 215 | Port Type: Other | ||
1868 | 216 | |||
1869 | 217 | Handle 0x0015, DMI type 8, 9 bytes | ||
1870 | 218 | Port Connector Information | ||
1871 | 219 | Internal Reference Designator: J9E1 - SCAN MATRIX | ||
1872 | 220 | Internal Connector Type: Other | ||
1873 | 221 | External Reference Designator: Not Specified | ||
1874 | 222 | External Connector Type: None | ||
1875 | 223 | Port Type: Other | ||
1876 | 224 | |||
1877 | 225 | Handle 0x0016, DMI type 8, 9 bytes | ||
1878 | 226 | Port Connector Information | ||
1879 | 227 | Internal Reference Designator: J9G1 - LPC SIDE BAND | ||
1880 | 228 | Internal Connector Type: Other | ||
1881 | 229 | External Reference Designator: Not Specified | ||
1882 | 230 | External Connector Type: None | ||
1883 | 231 | Port Type: Other | ||
1884 | 232 | |||
1885 | 233 | Handle 0x0017, DMI type 8, 9 bytes | ||
1886 | 234 | Port Connector Information | ||
1887 | 235 | Internal Reference Designator: J8F1 - UNIFIED | ||
1888 | 236 | Internal Connector Type: Other | ||
1889 | 237 | External Reference Designator: Not Specified | ||
1890 | 238 | External Connector Type: None | ||
1891 | 239 | Port Type: Other | ||
1892 | 240 | |||
1893 | 241 | Handle 0x0018, DMI type 8, 9 bytes | ||
1894 | 242 | Port Connector Information | ||
1895 | 243 | Internal Reference Designator: J6F1 - LVDS | ||
1896 | 244 | Internal Connector Type: Other | ||
1897 | 245 | External Reference Designator: Not Specified | ||
1898 | 246 | External Connector Type: None | ||
1899 | 247 | Port Type: Other | ||
1900 | 248 | |||
1901 | 249 | Handle 0x0019, DMI type 8, 9 bytes | ||
1902 | 250 | Port Connector Information | ||
1903 | 251 | Internal Reference Designator: J2F1 - LAI FAN | ||
1904 | 252 | Internal Connector Type: Other | ||
1905 | 253 | External Reference Designator: Not Specified | ||
1906 | 254 | External Connector Type: None | ||
1907 | 255 | Port Type: Other | ||
1908 | 256 | |||
1909 | 257 | Handle 0x001A, DMI type 8, 9 bytes | ||
1910 | 258 | Port Connector Information | ||
1911 | 259 | Internal Reference Designator: J2G1 - GFX VID | ||
1912 | 260 | Internal Connector Type: Other | ||
1913 | 261 | External Reference Designator: Not Specified | ||
1914 | 262 | External Connector Type: None | ||
1915 | 263 | Port Type: Other | ||
1916 | 264 | |||
1917 | 265 | Handle 0x001B, DMI type 8, 9 bytes | ||
1918 | 266 | Port Connector Information | ||
1919 | 267 | Internal Reference Designator: J1G6 - AC JACK | ||
1920 | 268 | Internal Connector Type: Other | ||
1921 | 269 | External Reference Designator: Not Specified | ||
1922 | 270 | External Connector Type: None | ||
1923 | 271 | Port Type: Other | ||
1924 | 272 | |||
1925 | 273 | Handle 0x001C, DMI type 9, 17 bytes | ||
1926 | 274 | System Slot Information | ||
1927 | 275 | Designation: J6B2 | ||
1928 | 276 | Type: x16 PCI Express | ||
1929 | 277 | Current Usage: Available | ||
1930 | 278 | Length: Long | ||
1931 | 279 | ID: 0 | ||
1932 | 280 | Characteristics: | ||
1933 | 281 | 3.3 V is provided | ||
1934 | 282 | Opening is shared | ||
1935 | 283 | PME signal is supported | ||
1936 | 284 | Bus Address: 0000:00:01.0 | ||
1937 | 285 | |||
1938 | 286 | Handle 0x001D, DMI type 10, 10 bytes | ||
1939 | 287 | On Board Device 1 Information | ||
1940 | 288 | Type: Video | ||
1941 | 289 | Status: Enabled | ||
1942 | 290 | Description: Intel(R) HD Graphics Device | ||
1943 | 291 | On Board Device 2 Information | ||
1944 | 292 | Type: Ethernet | ||
1945 | 293 | Status: Enabled | ||
1946 | 294 | Description: Intel(R) WGI218V Gigabit Network Device | ||
1947 | 295 | On Board Device 3 Information | ||
1948 | 296 | Type: Sound | ||
1949 | 297 | Status: Enabled | ||
1950 | 298 | Description: Realtek High Definition Audio Device | ||
1951 | 299 | |||
1952 | 300 | Handle 0x001E, DMI type 11, 5 bytes | ||
1953 | 301 | OEM Strings | ||
1954 | 302 | String 1: To Be Filled By O.E.M. | ||
1955 | 303 | |||
1956 | 304 | Handle 0x001F, DMI type 12, 5 bytes | ||
1957 | 305 | System Configuration Options | ||
1958 | 306 | Option 1: To Be Filled By O.E.M. | ||
1959 | 307 | |||
1960 | 308 | Handle 0x0020, DMI type 24, 5 bytes | ||
1961 | 309 | Hardware Security | ||
1962 | 310 | Power-On Password Status: Disabled | ||
1963 | 311 | Keyboard Password Status: Disabled | ||
1964 | 312 | Administrator Password Status: Disabled | ||
1965 | 313 | Front Panel Reset Status: Disabled | ||
1966 | 314 | |||
1967 | 315 | Handle 0x0021, DMI type 32, 20 bytes | ||
1968 | 316 | System Boot Information | ||
1969 | 317 | Status: No errors detected | ||
1970 | 318 | |||
1971 | 319 | Handle 0x0022, DMI type 34, 11 bytes | ||
1972 | 320 | Management Device | ||
1973 | 321 | Description: LM78-1 | ||
1974 | 322 | Type: LM78 | ||
1975 | 323 | Address: 0x00000000 | ||
1976 | 324 | Address Type: I/O Port | ||
1977 | 325 | |||
1978 | 326 | Handle 0x0023, DMI type 26, 22 bytes | ||
1979 | 327 | Voltage Probe | ||
1980 | 328 | Description: LM78A | ||
1981 | 329 | Location: <OUT OF SPEC> | ||
1982 | 330 | Status: <OUT OF SPEC> | ||
1983 | 331 | Maximum Value: Unknown | ||
1984 | 332 | Minimum Value: Unknown | ||
1985 | 333 | Resolution: Unknown | ||
1986 | 334 | Tolerance: Unknown | ||
1987 | 335 | Accuracy: Unknown | ||
1988 | 336 | OEM-specific Information: 0x00000000 | ||
1989 | 337 | Nominal Value: Unknown | ||
1990 | 338 | |||
1991 | 339 | Handle 0x0024, DMI type 36, 16 bytes | ||
1992 | 340 | Management Device Threshold Data | ||
1993 | 341 | Lower Non-critical Threshold: 1 | ||
1994 | 342 | Upper Non-critical Threshold: 2 | ||
1995 | 343 | Lower Critical Threshold: 3 | ||
1996 | 344 | Upper Critical Threshold: 4 | ||
1997 | 345 | Lower Non-recoverable Threshold: 5 | ||
1998 | 346 | Upper Non-recoverable Threshold: 6 | ||
1999 | 347 | |||
2000 | 348 | Handle 0x0025, DMI type 35, 11 bytes | ||
2001 | 349 | Management Device Component | ||
2002 | 350 | Description: To Be Filled By O.E.M. | ||
2003 | 351 | Management Device Handle: 0x0022 | ||
2004 | 352 | Component Handle: 0x0022 | ||
2005 | 353 | Threshold Handle: 0x0023 | ||
2006 | 354 | |||
2007 | 355 | Handle 0x0026, DMI type 28, 22 bytes | ||
2008 | 356 | Temperature Probe | ||
2009 | 357 | Description: LM78A | ||
2010 | 358 | Location: <OUT OF SPEC> | ||
2011 | 359 | Status: <OUT OF SPEC> | ||
2012 | 360 | Maximum Value: Unknown | ||
2013 | 361 | Minimum Value: Unknown | ||
2014 | 362 | Resolution: Unknown | ||
2015 | 363 | Tolerance: Unknown | ||
2016 | 364 | Accuracy: Unknown | ||
2017 | 365 | OEM-specific Information: 0x00000000 | ||
2018 | 366 | Nominal Value: Unknown | ||
2019 | 367 | |||
2020 | 368 | Handle 0x0027, DMI type 36, 16 bytes | ||
2021 | 369 | Management Device Threshold Data | ||
2022 | 370 | Lower Non-critical Threshold: 1 | ||
2023 | 371 | Upper Non-critical Threshold: 2 | ||
2024 | 372 | Lower Critical Threshold: 3 | ||
2025 | 373 | Upper Critical Threshold: 4 | ||
2026 | 374 | Lower Non-recoverable Threshold: 5 | ||
2027 | 375 | Upper Non-recoverable Threshold: 6 | ||
2028 | 376 | |||
2029 | 377 | Handle 0x0028, DMI type 35, 11 bytes | ||
2030 | 378 | Management Device Component | ||
2031 | 379 | Description: To Be Filled By O.E.M. | ||
2032 | 380 | Management Device Handle: 0x0022 | ||
2033 | 381 | Component Handle: 0x0025 | ||
2034 | 382 | Threshold Handle: 0x0026 | ||
2035 | 383 | |||
2036 | 384 | Handle 0x0029, DMI type 27, 15 bytes | ||
2037 | 385 | Cooling Device | ||
2038 | 386 | Temperature Probe Handle: 0x0026 | ||
2039 | 387 | Type: <OUT OF SPEC> | ||
2040 | 388 | Status: <OUT OF SPEC> | ||
2041 | 389 | Cooling Unit Group: 1 | ||
2042 | 390 | OEM-specific Information: 0x00000000 | ||
2043 | 391 | Nominal Speed: Unknown Or Non-rotating | ||
2044 | 392 | Description: Cooling Dev 1 | ||
2045 | 393 | |||
2046 | 394 | Handle 0x002A, DMI type 36, 16 bytes | ||
2047 | 395 | Management Device Threshold Data | ||
2048 | 396 | Lower Non-critical Threshold: 1 | ||
2049 | 397 | Upper Non-critical Threshold: 2 | ||
2050 | 398 | Lower Critical Threshold: 3 | ||
2051 | 399 | Upper Critical Threshold: 4 | ||
2052 | 400 | Lower Non-recoverable Threshold: 5 | ||
2053 | 401 | Upper Non-recoverable Threshold: 6 | ||
2054 | 402 | |||
2055 | 403 | Handle 0x002B, DMI type 35, 11 bytes | ||
2056 | 404 | Management Device Component | ||
2057 | 405 | Description: To Be Filled By O.E.M. | ||
2058 | 406 | Management Device Handle: 0x0022 | ||
2059 | 407 | Component Handle: 0x0028 | ||
2060 | 408 | Threshold Handle: 0x0029 | ||
2061 | 409 | |||
2062 | 410 | Handle 0x002C, DMI type 27, 15 bytes | ||
2063 | 411 | Cooling Device | ||
2064 | 412 | Temperature Probe Handle: 0x0026 | ||
2065 | 413 | Type: <OUT OF SPEC> | ||
2066 | 414 | Status: <OUT OF SPEC> | ||
2067 | 415 | Cooling Unit Group: 1 | ||
2068 | 416 | OEM-specific Information: 0x00000000 | ||
2069 | 417 | Nominal Speed: Unknown Or Non-rotating | ||
2070 | 418 | Description: Not Specified | ||
2071 | 419 | |||
2072 | 420 | Handle 0x002D, DMI type 36, 16 bytes | ||
2073 | 421 | Management Device Threshold Data | ||
2074 | 422 | Lower Non-critical Threshold: 1 | ||
2075 | 423 | Upper Non-critical Threshold: 2 | ||
2076 | 424 | Lower Critical Threshold: 3 | ||
2077 | 425 | Upper Critical Threshold: 4 | ||
2078 | 426 | Lower Non-recoverable Threshold: 5 | ||
2079 | 427 | Upper Non-recoverable Threshold: 6 | ||
2080 | 428 | |||
2081 | 429 | Handle 0x002E, DMI type 35, 11 bytes | ||
2082 | 430 | Management Device Component | ||
2083 | 431 | Description: To Be Filled By O.E.M. | ||
2084 | 432 | Management Device Handle: 0x0022 | ||
2085 | 433 | Component Handle: 0x002B | ||
2086 | 434 | Threshold Handle: 0x002C | ||
2087 | 435 | |||
2088 | 436 | Handle 0x002F, DMI type 29, 22 bytes | ||
2089 | 437 | Electrical Current Probe | ||
2090 | 438 | Description: ABC | ||
2091 | 439 | Location: <OUT OF SPEC> | ||
2092 | 440 | Status: <OUT OF SPEC> | ||
2093 | 441 | Maximum Value: Unknown | ||
2094 | 442 | Minimum Value: Unknown | ||
2095 | 443 | Resolution: Unknown | ||
2096 | 444 | Tolerance: Unknown | ||
2097 | 445 | Accuracy: Unknown | ||
2098 | 446 | OEM-specific Information: 0x00000000 | ||
2099 | 447 | Nominal Value: Unknown | ||
2100 | 448 | |||
2101 | 449 | Handle 0x0030, DMI type 36, 16 bytes | ||
2102 | 450 | Management Device Threshold Data | ||
2103 | 451 | |||
2104 | 452 | Handle 0x0031, DMI type 35, 11 bytes | ||
2105 | 453 | Management Device Component | ||
2106 | 454 | Description: To Be Filled By O.E.M. | ||
2107 | 455 | Management Device Handle: 0x0022 | ||
2108 | 456 | Component Handle: 0x002E | ||
2109 | 457 | Threshold Handle: 0x002C | ||
2110 | 458 | |||
2111 | 459 | Handle 0x0032, DMI type 26, 22 bytes | ||
2112 | 460 | Voltage Probe | ||
2113 | 461 | Description: LM78A | ||
2114 | 462 | Location: Power Unit | ||
2115 | 463 | Status: OK | ||
2116 | 464 | Maximum Value: Unknown | ||
2117 | 465 | Minimum Value: Unknown | ||
2118 | 466 | Resolution: Unknown | ||
2119 | 467 | Tolerance: Unknown | ||
2120 | 468 | Accuracy: Unknown | ||
2121 | 469 | OEM-specific Information: 0x00000000 | ||
2122 | 470 | Nominal Value: Unknown | ||
2123 | 471 | |||
2124 | 472 | Handle 0x0033, DMI type 28, 22 bytes | ||
2125 | 473 | Temperature Probe | ||
2126 | 474 | Description: LM78A | ||
2127 | 475 | Location: Power Unit | ||
2128 | 476 | Status: OK | ||
2129 | 477 | Maximum Value: Unknown | ||
2130 | 478 | Minimum Value: Unknown | ||
2131 | 479 | Resolution: Unknown | ||
2132 | 480 | Tolerance: Unknown | ||
2133 | 481 | Accuracy: Unknown | ||
2134 | 482 | OEM-specific Information: 0x00000000 | ||
2135 | 483 | Nominal Value: Unknown | ||
2136 | 484 | |||
2137 | 485 | Handle 0x0034, DMI type 27, 15 bytes | ||
2138 | 486 | Cooling Device | ||
2139 | 487 | Temperature Probe Handle: 0x0033 | ||
2140 | 488 | Type: Power Supply Fan | ||
2141 | 489 | Status: OK | ||
2142 | 490 | Cooling Unit Group: 1 | ||
2143 | 491 | OEM-specific Information: 0x00000000 | ||
2144 | 492 | Nominal Speed: Unknown Or Non-rotating | ||
2145 | 493 | Description: Cooling Dev 1 | ||
2146 | 494 | |||
2147 | 495 | Handle 0x0035, DMI type 29, 22 bytes | ||
2148 | 496 | Electrical Current Probe | ||
2149 | 497 | Description: ABC | ||
2150 | 498 | Location: Power Unit | ||
2151 | 499 | Status: OK | ||
2152 | 500 | Maximum Value: Unknown | ||
2153 | 501 | Minimum Value: Unknown | ||
2154 | 502 | Resolution: Unknown | ||
2155 | 503 | Tolerance: Unknown | ||
2156 | 504 | Accuracy: Unknown | ||
2157 | 505 | OEM-specific Information: 0x00000000 | ||
2158 | 506 | Nominal Value: Unknown | ||
2159 | 507 | |||
2160 | 508 | Handle 0x0036, DMI type 39, 22 bytes | ||
2161 | 509 | System Power Supply | ||
2162 | 510 | Power Unit Group: 1 | ||
2163 | 511 | Location: To Be Filled By O.E.M. | ||
2164 | 512 | Name: To Be Filled By O.E.M. | ||
2165 | 513 | Manufacturer: To Be Filled By O.E.M. | ||
2166 | 514 | Serial Number: To Be Filled By O.E.M. | ||
2167 | 515 | Asset Tag: To Be Filled By O.E.M. | ||
2168 | 516 | Model Part Number: To Be Filled By O.E.M. | ||
2169 | 517 | Revision: To Be Filled By O.E.M. | ||
2170 | 518 | Max Power Capacity: Unknown | ||
2171 | 519 | Status: Present, OK | ||
2172 | 520 | Type: Switching | ||
2173 | 521 | Input Voltage Range Switching: Auto-switch | ||
2174 | 522 | Plugged: Yes | ||
2175 | 523 | Hot Replaceable: No | ||
2176 | 524 | Input Voltage Probe Handle: 0x0032 | ||
2177 | 525 | Cooling Device Handle: 0x0034 | ||
2178 | 526 | Input Current Probe Handle: 0x0035 | ||
2179 | 527 | |||
2180 | 528 | Handle 0x0037, DMI type 41, 11 bytes | ||
2181 | 529 | Onboard Device | ||
2182 | 530 | Reference Designation: CPU1 | ||
2183 | 531 | Type: Video | ||
2184 | 532 | Status: Enabled | ||
2185 | 533 | Type Instance: 1 | ||
2186 | 534 | Bus Address: 0000:00:02.0 | ||
2187 | 535 | |||
2188 | 536 | Handle 0x0038, DMI type 41, 11 bytes | ||
2189 | 537 | Onboard Device | ||
2190 | 538 | Reference Designation: ILAN | ||
2191 | 539 | Type: Ethernet | ||
2192 | 540 | Status: Enabled | ||
2193 | 541 | Type Instance: 1 | ||
2194 | 542 | Bus Address: 0000:00:19.0 | ||
2195 | 543 | |||
2196 | 544 | Handle 0x0039, DMI type 41, 11 bytes | ||
2197 | 545 | Onboard Device | ||
2198 | 546 | Reference Designation: AUDIO1 | ||
2199 | 547 | Type: Sound | ||
2200 | 548 | Status: Enabled | ||
2201 | 549 | Type Instance: 1 | ||
2202 | 550 | Bus Address: 0000:00:1b.0 | ||
2203 | 551 | |||
2204 | 552 | Handle 0x003A, DMI type 4, 42 bytes | ||
2205 | 553 | Processor Information | ||
2206 | 554 | Socket Designation: CPU 1 | ||
2207 | 555 | Type: Central Processor | ||
2208 | 556 | Family: Core i3 | ||
2209 | 557 | Manufacturer: Intel(R) Corp. | ||
2210 | 558 | ID: 51 06 04 00 FF FB EB BF | ||
2211 | 559 | Signature: Type 0, Family 6, Model 69, Stepping 1 | ||
2212 | 560 | Flags: | ||
2213 | 561 | FPU (Floating-point unit on-chip) | ||
2214 | 562 | VME (Virtual mode extension) | ||
2215 | 563 | DE (Debugging extension) | ||
2216 | 564 | PSE (Page size extension) | ||
2217 | 565 | TSC (Time stamp counter) | ||
2218 | 566 | MSR (Model specific registers) | ||
2219 | 567 | PAE (Physical address extension) | ||
2220 | 568 | MCE (Machine check exception) | ||
2221 | 569 | CX8 (CMPXCHG8 instruction supported) | ||
2222 | 570 | APIC (On-chip APIC hardware supported) | ||
2223 | 571 | SEP (Fast system call) | ||
2224 | 572 | MTRR (Memory type range registers) | ||
2225 | 573 | PGE (Page global enable) | ||
2226 | 574 | MCA (Machine check architecture) | ||
2227 | 575 | CMOV (Conditional move instruction supported) | ||
2228 | 576 | PAT (Page attribute table) | ||
2229 | 577 | PSE-36 (36-bit page size extension) | ||
2230 | 578 | CLFSH (CLFLUSH instruction supported) | ||
2231 | 579 | DS (Debug store) | ||
2232 | 580 | ACPI (ACPI supported) | ||
2233 | 581 | MMX (MMX technology supported) | ||
2234 | 582 | FXSR (FXSAVE and FXSTOR instructions supported) | ||
2235 | 583 | SSE (Streaming SIMD extensions) | ||
2236 | 584 | SSE2 (Streaming SIMD extensions 2) | ||
2237 | 585 | SS (Self-snoop) | ||
2238 | 586 | HTT (Multi-threading) | ||
2239 | 587 | TM (Thermal monitor supported) | ||
2240 | 588 | PBE (Pending break enabled) | ||
2241 | 589 | Version: Intel(R) Core(TM) i3-4010U CPU @ 1.70GHz | ||
2242 | 590 | Voltage: 1.2 V | ||
2243 | 591 | External Clock: 100 MHz | ||
2244 | 592 | Max Speed: 1700 MHz | ||
2245 | 593 | Current Speed: 1700 MHz | ||
2246 | 594 | Status: Populated, Enabled | ||
2247 | 595 | Upgrade: <OUT OF SPEC> | ||
2248 | 596 | L1 Cache Handle: 0x003C | ||
2249 | 597 | L2 Cache Handle: 0x003B | ||
2250 | 598 | L3 Cache Handle: 0x003D | ||
2251 | 599 | Serial Number: Not Specified | ||
2252 | 600 | Asset Tag: Fill By OEM | ||
2253 | 601 | Part Number: Fill By OEM | ||
2254 | 602 | Core Count: 2 | ||
2255 | 603 | Core Enabled: 2 | ||
2256 | 604 | Thread Count: 4 | ||
2257 | 605 | Characteristics: | ||
2258 | 606 | 64-bit capable | ||
2259 | 607 | |||
2260 | 608 | Handle 0x003B, DMI type 7, 19 bytes | ||
2261 | 609 | Cache Information | ||
2262 | 610 | Socket Designation: CPU Internal L2 | ||
2263 | 611 | Configuration: Enabled, Not Socketed, Level 2 | ||
2264 | 612 | Operational Mode: Write Back | ||
2265 | 613 | Location: Internal | ||
2266 | 614 | Installed Size: 512 kB | ||
2267 | 615 | Maximum Size: 512 kB | ||
2268 | 616 | Supported SRAM Types: | ||
2269 | 617 | Unknown | ||
2270 | 618 | Installed SRAM Type: Unknown | ||
2271 | 619 | Speed: Unknown | ||
2272 | 620 | Error Correction Type: Single-bit ECC | ||
2273 | 621 | System Type: Unified | ||
2274 | 622 | Associativity: 8-way Set-associative | ||
2275 | 623 | |||
2276 | 624 | Handle 0x003C, DMI type 7, 19 bytes | ||
2277 | 625 | Cache Information | ||
2278 | 626 | Socket Designation: CPU Internal L1 | ||
2279 | 627 | Configuration: Enabled, Not Socketed, Level 1 | ||
2280 | 628 | Operational Mode: Write Back | ||
2281 | 629 | Location: Internal | ||
2282 | 630 | Installed Size: 128 kB | ||
2283 | 631 | Maximum Size: 128 kB | ||
2284 | 632 | Supported SRAM Types: | ||
2285 | 633 | Unknown | ||
2286 | 634 | Installed SRAM Type: Unknown | ||
2287 | 635 | Speed: Unknown | ||
2288 | 636 | Error Correction Type: Single-bit ECC | ||
2289 | 637 | System Type: Other | ||
2290 | 638 | Associativity: 8-way Set-associative | ||
2291 | 639 | |||
2292 | 640 | Handle 0x003D, DMI type 7, 19 bytes | ||
2293 | 641 | Cache Information | ||
2294 | 642 | Socket Designation: CPU Internal L3 | ||
2295 | 643 | Configuration: Enabled, Not Socketed, Level 3 | ||
2296 | 644 | Operational Mode: Write Back | ||
2297 | 645 | Location: Internal | ||
2298 | 646 | Installed Size: 3072 kB | ||
2299 | 647 | Maximum Size: 3072 kB | ||
2300 | 648 | Supported SRAM Types: | ||
2301 | 649 | Unknown | ||
2302 | 650 | Installed SRAM Type: Unknown | ||
2303 | 651 | Speed: Unknown | ||
2304 | 652 | Error Correction Type: Single-bit ECC | ||
2305 | 653 | System Type: Unified | ||
2306 | 654 | Associativity: 12-way Set-associative | ||
2307 | 655 | |||
2308 | 656 | Handle 0x003E, DMI type 16, 23 bytes | ||
2309 | 657 | Physical Memory Array | ||
2310 | 658 | Location: System Board Or Motherboard | ||
2311 | 659 | Use: System Memory | ||
2312 | 660 | Error Correction Type: None | ||
2313 | 661 | Maximum Capacity: 16 GB | ||
2314 | 662 | Error Information Handle: Not Provided | ||
2315 | 663 | Number Of Devices: 2 | ||
2316 | 664 | |||
2317 | 665 | Handle 0x003F, DMI type 17, 40 bytes | ||
2318 | 666 | Memory Device | ||
2319 | 667 | Array Handle: 0x003E | ||
2320 | 668 | Error Information Handle: Not Provided | ||
2321 | 669 | Total Width: 64 bits | ||
2322 | 670 | Data Width: 64 bits | ||
2323 | 671 | Size: 8192 MB | ||
2324 | 672 | Form Factor: SODIMM | ||
2325 | 673 | Set: None | ||
2326 | 674 | Locator: DIMM 1 | ||
2327 | 675 | Bank Locator: Channel A Slot 0 | ||
2328 | 676 | Type: DDR3 | ||
2329 | 677 | Type Detail: Synchronous | ||
2330 | 678 | Speed: 1600 MHz | ||
2331 | 679 | Manufacturer: 1315 | ||
2332 | 680 | Serial Number: 102007000000 | ||
2333 | 681 | Asset Tag: 9876543210 | ||
2334 | 682 | Part Number: CT102464BF160B.C16 | ||
2335 | 683 | Rank: 2 | ||
2336 | 684 | Configured Clock Speed: 1600 MHz | ||
2337 | 685 | Minimum voltage: 1.350 V | ||
2338 | 686 | Maximum voltage: 1.500 V | ||
2339 | 687 | Configured voltage: 1.350 V | ||
2340 | 688 | |||
2341 | 689 | Handle 0x0040, DMI type 20, 35 bytes | ||
2342 | 690 | Memory Device Mapped Address | ||
2343 | 691 | Starting Address: 0x00000000000 | ||
2344 | 692 | Ending Address: 0x001FFFFFFFF | ||
2345 | 693 | Range Size: 8 GB | ||
2346 | 694 | Physical Device Handle: 0x003F | ||
2347 | 695 | Memory Array Mapped Address Handle: 0x0043 | ||
2348 | 696 | Partition Row Position: Unknown | ||
2349 | 697 | Interleave Position: Unknown | ||
2350 | 698 | Interleaved Data Depth: Unknown | ||
2351 | 699 | |||
2352 | 700 | Handle 0x0041, DMI type 17, 40 bytes | ||
2353 | 701 | Memory Device | ||
2354 | 702 | Array Handle: 0x003E | ||
2355 | 703 | Error Information Handle: Not Provided | ||
2356 | 704 | Total Width: 64 bits | ||
2357 | 705 | Data Width: 64 bits | ||
2358 | 706 | Size: 8192 MB | ||
2359 | 707 | Form Factor: SODIMM | ||
2360 | 708 | Set: None | ||
2361 | 709 | Locator: DIMM 2 | ||
2362 | 710 | Bank Locator: Channel B Slot 0 | ||
2363 | 711 | Type: DDR3 | ||
2364 | 712 | Type Detail: Synchronous | ||
2365 | 713 | Speed: 1600 MHz | ||
2366 | 714 | Manufacturer: 1315 | ||
2367 | 715 | Serial Number: 037018000000 | ||
2368 | 716 | Asset Tag: 9876543210 | ||
2369 | 717 | Part Number: CT102464BF160B.C16 | ||
2370 | 718 | Rank: 2 | ||
2371 | 719 | Configured Clock Speed: 1600 MHz | ||
2372 | 720 | Minimum voltage: 1.350 V | ||
2373 | 721 | Maximum voltage: 1.500 V | ||
2374 | 722 | Configured voltage: 1.350 V | ||
2375 | 723 | |||
2376 | 724 | Handle 0x0042, DMI type 20, 35 bytes | ||
2377 | 725 | Memory Device Mapped Address | ||
2378 | 726 | Starting Address: 0x00200000000 | ||
2379 | 727 | Ending Address: 0x003FFFFFFFF | ||
2380 | 728 | Range Size: 8 GB | ||
2381 | 729 | Physical Device Handle: 0x0041 | ||
2382 | 730 | Memory Array Mapped Address Handle: 0x0043 | ||
2383 | 731 | Partition Row Position: Unknown | ||
2384 | 732 | Interleave Position: Unknown | ||
2385 | 733 | Interleaved Data Depth: Unknown | ||
2386 | 734 | |||
2387 | 735 | Handle 0x0043, DMI type 19, 31 bytes | ||
2388 | 736 | Memory Array Mapped Address | ||
2389 | 737 | Starting Address: 0x00000000000 | ||
2390 | 738 | Ending Address: 0x003FFFFFFFF | ||
2391 | 739 | Range Size: 16 GB | ||
2392 | 740 | Physical Array Handle: 0x003E | ||
2393 | 741 | Partition Width: 2 | ||
2394 | 742 | |||
2395 | 743 | Handle 0x0054, DMI type 136, 6 bytes | ||
2396 | 744 | OEM-specific Type | ||
2397 | 745 | Header and Data: | ||
2398 | 746 | 88 06 54 00 5A 5A | ||
2399 | 747 | |||
2400 | 748 | Handle 0x0055, DMI type 131, 64 bytes | ||
2401 | 749 | OEM-specific Type | ||
2402 | 750 | Header and Data: | ||
2403 | 751 | 83 40 55 00 31 00 00 00 00 00 00 00 00 00 00 00 | ||
2404 | 752 | F8 00 43 9C 00 00 00 00 01 00 00 00 05 00 09 00 | ||
2405 | 753 | AA 06 0D 00 00 00 00 00 C8 00 59 15 00 00 00 00 | ||
2406 | 754 | 00 00 00 00 26 00 00 00 76 50 72 6F 00 00 00 00 | ||
2407 | 755 | |||
2408 | 756 | Handle 0x0057, DMI type 9, 17 bytes | ||
2409 | 757 | System Slot Information | ||
2410 | 758 | Designation: PCIeSlot | ||
2411 | 759 | Type: x1 PCI Express 2 x1 | ||
2412 | 760 | Current Usage: Available | ||
2413 | 761 | Length: Short | ||
2414 | 762 | ID: 7 | ||
2415 | 763 | Characteristics: | ||
2416 | 764 | 3.3 V is provided | ||
2417 | 765 | Opening is shared | ||
2418 | 766 | PME signal is supported | ||
2419 | 767 | Bus Address: 0000:00:1c.5 | ||
2420 | 768 | |||
2421 | 769 | Handle 0x0058, DMI type 9, 17 bytes | ||
2422 | 770 | System Slot Information | ||
2423 | 771 | Designation: PCIeSlot | ||
2424 | 772 | Type: x1 PCI Express 2 x1 | ||
2425 | 773 | Current Usage: Available | ||
2426 | 774 | Length: Short | ||
2427 | 775 | ID: 5 | ||
2428 | 776 | Characteristics: | ||
2429 | 777 | 3.3 V is provided | ||
2430 | 778 | Opening is shared | ||
2431 | 779 | PME signal is supported | ||
2432 | 780 | Bus Address: 0000:00:1c.6 | ||
2433 | 781 | |||
2434 | 782 | Handle 0x0059, DMI type 9, 17 bytes | ||
2435 | 783 | System Slot Information | ||
2436 | 784 | Designation: PCIeSlot | ||
2437 | 785 | Type: x4 PCI Express 2 x4 | ||
2438 | 786 | Current Usage: Available | ||
2439 | 787 | Length: Short | ||
2440 | 788 | ID: 4 | ||
2441 | 789 | Characteristics: | ||
2442 | 790 | 3.3 V is provided | ||
2443 | 791 | Opening is shared | ||
2444 | 792 | PME signal is supported | ||
2445 | 793 | Bus Address: 0000:00:1c.1 | ||
2446 | 794 | |||
2447 | 795 | Handle 0x005A, DMI type 9, 17 bytes | ||
2448 | 796 | System Slot Information | ||
2449 | 797 | Designation: PCI Slot | ||
2450 | 798 | Type: 32-bit PCI | ||
2451 | 799 | Current Usage: Available | ||
2452 | 800 | Length: Short | ||
2453 | 801 | ID: 3 | ||
2454 | 802 | Characteristics: | ||
2455 | 803 | 3.3 V is provided | ||
2456 | 804 | Opening is shared | ||
2457 | 805 | PME signal is supported | ||
2458 | 806 | Bus Address: 0000:ff:00.0 | ||
2459 | 807 | |||
2460 | 808 | Handle 0x005B, DMI type 9, 17 bytes | ||
2461 | 809 | System Slot Information | ||
2462 | 810 | Designation: PCI Slot | ||
2463 | 811 | Type: 32-bit PCI | ||
2464 | 812 | Current Usage: Available | ||
2465 | 813 | Length: Short | ||
2466 | 814 | ID: 2 | ||
2467 | 815 | Characteristics: | ||
2468 | 816 | 3.3 V is provided | ||
2469 | 817 | Opening is shared | ||
2470 | 818 | PME signal is supported | ||
2471 | 819 | Bus Address: 0000:ff:01.0 | ||
2472 | 820 | |||
2473 | 821 | Handle 0x005C, DMI type 9, 17 bytes | ||
2474 | 822 | System Slot Information | ||
2475 | 823 | Designation: PCI Slot | ||
2476 | 824 | Type: 32-bit PCI | ||
2477 | 825 | Current Usage: Available | ||
2478 | 826 | Length: Short | ||
2479 | 827 | ID: 1 | ||
2480 | 828 | Characteristics: | ||
2481 | 829 | 3.3 V is provided | ||
2482 | 830 | Opening is shared | ||
2483 | 831 | PME signal is supported | ||
2484 | 832 | Bus Address: 0000:ff:02.0 | ||
2485 | 833 | |||
2486 | 834 | Handle 0x005D, DMI type 13, 22 bytes | ||
2487 | 835 | BIOS Language Information | ||
2488 | 836 | Language Description Format: Long | ||
2489 | 837 | Installable Languages: 1 | ||
2490 | 838 | en|US|iso8859-1 | ||
2491 | 839 | Currently Installed Language: en|US|iso8859-1 | ||
2492 | 840 | |||
2493 | 841 | Handle 0x0060, DMI type 9, 17 bytes | ||
2494 | 842 | System Slot Information | ||
2495 | 843 | Designation: PCIeSlot | ||
2496 | 844 | Type: x1 PCI Express 2 x1 | ||
2497 | 845 | Current Usage: Available | ||
2498 | 846 | Length: Short | ||
2499 | 847 | ID: 7 | ||
2500 | 848 | Characteristics: | ||
2501 | 849 | 3.3 V is provided | ||
2502 | 850 | Opening is shared | ||
2503 | 851 | PME signal is supported | ||
2504 | 852 | Bus Address: 0000:00:1c.5 | ||
2505 | 853 | |||
2506 | 854 | Handle 0x0061, DMI type 9, 17 bytes | ||
2507 | 855 | System Slot Information | ||
2508 | 856 | Designation: PCIeSlot | ||
2509 | 857 | Type: x1 PCI Express 2 x1 | ||
2510 | 858 | Current Usage: Available | ||
2511 | 859 | Length: Short | ||
2512 | 860 | ID: 5 | ||
2513 | 861 | Characteristics: | ||
2514 | 862 | 3.3 V is provided | ||
2515 | 863 | Opening is shared | ||
2516 | 864 | PME signal is supported | ||
2517 | 865 | Bus Address: 0000:00:1c.6 | ||
2518 | 866 | |||
2519 | 867 | Handle 0x0062, DMI type 9, 17 bytes | ||
2520 | 868 | System Slot Information | ||
2521 | 869 | Designation: PCIeSlot | ||
2522 | 870 | Type: x4 PCI Express 2 x4 | ||
2523 | 871 | Current Usage: Available | ||
2524 | 872 | Length: Short | ||
2525 | 873 | ID: 4 | ||
2526 | 874 | Characteristics: | ||
2527 | 875 | 3.3 V is provided | ||
2528 | 876 | Opening is shared | ||
2529 | 877 | PME signal is supported | ||
2530 | 878 | Bus Address: 0000:00:1c.1 | ||
2531 | 879 | |||
2532 | 880 | Handle 0x0063, DMI type 9, 17 bytes | ||
2533 | 881 | System Slot Information | ||
2534 | 882 | Designation: PCI Slot | ||
2535 | 883 | Type: 32-bit PCI | ||
2536 | 884 | Current Usage: Available | ||
2537 | 885 | Length: Short | ||
2538 | 886 | ID: 3 | ||
2539 | 887 | Characteristics: | ||
2540 | 888 | 3.3 V is provided | ||
2541 | 889 | Opening is shared | ||
2542 | 890 | PME signal is supported | ||
2543 | 891 | Bus Address: 0000:ff:00.0 | ||
2544 | 892 | |||
2545 | 893 | Handle 0x0064, DMI type 9, 17 bytes | ||
2546 | 894 | System Slot Information | ||
2547 | 895 | Designation: PCI Slot | ||
2548 | 896 | Type: 32-bit PCI | ||
2549 | 897 | Current Usage: Available | ||
2550 | 898 | Length: Short | ||
2551 | 899 | ID: 2 | ||
2552 | 900 | Characteristics: | ||
2553 | 901 | 3.3 V is provided | ||
2554 | 902 | Opening is shared | ||
2555 | 903 | PME signal is supported | ||
2556 | 904 | Bus Address: 0000:ff:01.0 | ||
2557 | 905 | |||
2558 | 906 | Handle 0x0065, DMI type 9, 17 bytes | ||
2559 | 907 | System Slot Information | ||
2560 | 908 | Designation: PCI Slot | ||
2561 | 909 | Type: 32-bit PCI | ||
2562 | 910 | Current Usage: Available | ||
2563 | 911 | Length: Short | ||
2564 | 912 | ID: 1 | ||
2565 | 913 | Characteristics: | ||
2566 | 914 | 3.3 V is provided | ||
2567 | 915 | Opening is shared | ||
2568 | 916 | PME signal is supported | ||
2569 | 917 | Bus Address: 0000:ff:02.0 | ||
2570 | 918 | |||
2571 | 919 | Handle 0x0066, DMI type 127, 4 bytes | ||
2572 | 920 | End Of Table | ||
2573 | 0 | 921 | ||
2574 | === modified file 't/pt-variable-advisor/samples/vars001-ignore-rules.txt' | |||
2575 | --- t/pt-variable-advisor/samples/vars001-ignore-rules.txt 2011-06-24 22:02:05 +0000 | |||
2576 | +++ t/pt-variable-advisor/samples/vars001-ignore-rules.txt 2014-09-29 19:43:03 +0000 | |||
2577 | @@ -10,6 +10,8 @@ | |||
2578 | 10 | 10 | ||
2579 | 11 | # WARN slave_net_timeout: This variable is set too high. | 11 | # WARN slave_net_timeout: This variable is set too high. |
2580 | 12 | 12 | ||
2581 | 13 | # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. | ||
2582 | 14 | |||
2583 | 13 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. | 15 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. |
2584 | 14 | 16 | ||
2585 | 15 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. | 17 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. |
2586 | 16 | 18 | ||
2587 | === modified file 't/pt-variable-advisor/samples/vars001-verbose-verbose.txt' | |||
2588 | --- t/pt-variable-advisor/samples/vars001-verbose-verbose.txt 2011-07-13 22:36:14 +0000 | |||
2589 | +++ t/pt-variable-advisor/samples/vars001-verbose-verbose.txt 2014-09-29 19:43:03 +0000 | |||
2590 | @@ -10,6 +10,8 @@ | |||
2591 | 10 | 10 | ||
2592 | 11 | # WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the master has failed and retrying. This should probably be set to 60 seconds or less. It is also a good idea to use pt-heartbeat to ensure that the connection does not appear to time out when the master is simply idle. | 11 | # WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the master has failed and retrying. This should probably be set to 60 seconds or less. It is also a good idea to use pt-heartbeat to ensure that the connection does not appear to time out when the master is simply idle. |
2593 | 12 | 12 | ||
2594 | 13 | # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. If you do not purge binary logs, your disk will fill up. If you delete binary logs externally to MySQL, you will cause unwanted behaviors. Always ask MySQL to purge obsolete logs, never delete them externally. | ||
2595 | 14 | |||
2596 | 13 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. Some people prefer to set innodb_file_per_table and allocate a fixed-size file for ibdata1. | 15 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. Some people prefer to set innodb_file_per_table and allocate a fixed-size file for ibdata1. |
2597 | 14 | 16 | ||
2598 | 15 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. | 17 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. |
2599 | 16 | 18 | ||
2600 | === modified file 't/pt-variable-advisor/samples/vars001-verbose.txt' | |||
2601 | --- t/pt-variable-advisor/samples/vars001-verbose.txt 2011-06-24 22:02:05 +0000 | |||
2602 | +++ t/pt-variable-advisor/samples/vars001-verbose.txt 2014-09-29 19:43:03 +0000 | |||
2603 | @@ -10,6 +10,8 @@ | |||
2604 | 10 | 10 | ||
2605 | 11 | # WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the master has failed and retrying. | 11 | # WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the master has failed and retrying. |
2606 | 12 | 12 | ||
2607 | 13 | # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. If you do not purge binary logs, your disk will fill up. | ||
2608 | 14 | |||
2609 | 13 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. Some people prefer to set innodb_file_per_table and allocate a fixed-size file for ibdata1. | 15 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. Some people prefer to set innodb_file_per_table and allocate a fixed-size file for ibdata1. |
2610 | 14 | 16 | ||
2611 | 15 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. | 17 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. |
2612 | 16 | 18 | ||
2613 | === modified file 't/pt-variable-advisor/samples/vars001.txt' | |||
2614 | --- t/pt-variable-advisor/samples/vars001.txt 2011-06-24 22:02:05 +0000 | |||
2615 | +++ t/pt-variable-advisor/samples/vars001.txt 2014-09-29 19:43:03 +0000 | |||
2616 | @@ -10,6 +10,8 @@ | |||
2617 | 10 | 10 | ||
2618 | 11 | # WARN slave_net_timeout: This variable is set too high. | 11 | # WARN slave_net_timeout: This variable is set too high. |
2619 | 12 | 12 | ||
2620 | 13 | # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. | ||
2621 | 14 | |||
2622 | 13 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. | 15 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. |
2623 | 14 | 16 | ||
2624 | 15 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. | 17 | # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance. |
2625 | 16 | 18 | ||
2626 | === modified file 't/pt-variable-advisor/samples/vars002.txt' | |||
2627 | --- t/pt-variable-advisor/samples/vars002.txt 2011-06-24 22:02:05 +0000 | |||
2628 | +++ t/pt-variable-advisor/samples/vars002.txt 2014-09-29 19:43:03 +0000 | |||
2629 | @@ -10,6 +10,8 @@ | |||
2630 | 10 | 10 | ||
2631 | 11 | # WARN slave_net_timeout: This variable is set too high. | 11 | # WARN slave_net_timeout: This variable is set too high. |
2632 | 12 | 12 | ||
2633 | 13 | # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. | ||
2634 | 14 | |||
2635 | 13 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. | 15 | # NOTE innodb_data_file_path: Auto-extending InnoDB files can consume a lot of disk space that is very difficult to reclaim later. |
2636 | 14 | 16 | ||
2637 | 15 | # WARN myisam_recover_options: myisam_recover_options should be set to some value such as BACKUP,FORCE to ensure that table corruption is noticed. | 17 | # WARN myisam_recover_options: myisam_recover_options should be set to some value such as BACKUP,FORCE to ensure that table corruption is noticed. |
On quick look, looks good, just sort the changelog entries if you all want to continue this practice.