Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1015590-pt-mysql-summary-percona-server-5.5 into lp:percona-toolkit/2.1
- fix-1015590-pt-mysql-summary-percona-server-5.5
- Merge into 2.1
Status: | Merged |
---|---|
Approved by: | Daniel Nichter |
Approved revision: | 445 |
Merged at revision: | 485 |
Proposed branch: | lp:~percona-toolkit-dev/percona-toolkit/fix-1015590-pt-mysql-summary-percona-server-5.5 |
Merge into: | lp:percona-toolkit/2.1 |
Diff against target: |
1439 lines (+1257/-31) 10 files modified
bin/pt-mysql-summary (+41/-11) lib/bash/report_mysql_info.sh (+50/-11) t/lib/bash/report_mysql_info.sh (+26/-1) t/pt-mysql-summary/samples/expected_output_ps-5.1-features.txt (+12/-0) t/pt-mysql-summary/samples/expected_output_ps-5.1-martin.txt (+12/-0) t/pt-mysql-summary/samples/expected_output_ps-features.txt (+12/-0) t/pt-mysql-summary/samples/expected_output_temp002.txt (+8/-8) t/pt-mysql-summary/samples/percona-server-5.1-variables (+363/-0) t/pt-mysql-summary/samples/percona-server-5.1-variables-martin (+353/-0) t/pt-mysql-summary/samples/percona-server-5.5-variables (+380/-0) |
To merge this branch: | bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-1015590-pt-mysql-summary-percona-server-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Nichter | Approve | ||
Brian Fraser (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Brian Fraser (fraserbn) wrote : | # |
I didn't modify feat_on because that's already cluttered as-is, but instead I added feat_on_renamed which takes a comma-separated list of varnames to check. One place -- Smooth Flushing -- is still using the long form though, because both the varname and the default value changed.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel Nichter (daniel-nichter) wrote : | # |
Looks good, but let me suggest one change to make feat_on_renamed() a little nicer:
feat_on_renamed() {
local file="$1"
shift;
for varname in "$@"; do
...
done
}
Then simply call like feat_on /tmp/foo bat baz
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Brian Fraser (fraserbn) wrote : | # |
Changing feat_on_renamed() to a for loop would leave us unable to do
feat_on_renamed $file "var,var" "ne" "OFF"
Which you can do with feat_on:
smooth_
However, we don't currently use that for feat_on_renamed, so it's no real loss. Should I change it, or leave it as is?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel Nichter (daniel-nichter) wrote : | # |
I would change it because
smooth_
looks very hackish, and since we don't need it, there's no reason to program dead code to handle non-existent situations. If ever we need something like that, i.e. where we're not looking for "ON" or "1" but something else like "native", then a less hackish design would entail asking if this is common enough to warrant its own version of feat_on() (e.g. feat_is "native" "innodb_
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Brian Fraser (fraserbn) wrote : | # |
Aye, sounds good to me then. Changed.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Brian Fraser (fraserbn) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel Nichter (daniel-nichter) : | # |
Preview Diff
1 | === modified file 'bin/pt-mysql-summary' |
2 | --- bin/pt-mysql-summary 2012-11-19 18:47:13 +0000 |
3 | +++ bin/pt-mysql-summary 2012-12-04 16:22:36 +0000 |
4 | @@ -1004,19 +1004,19 @@ |
5 | local varname="$2" |
6 | [ -e "$file" ] || return |
7 | |
8 | - if [ "$( get_var "$varname" "${file}" )" ]; then |
9 | + if [ "$( grep "$varname" "${file}" )" ]; then |
10 | local var="$(awk "\$1 ~ /^$2$/ { print \$2 }" $file)" |
11 | if [ "${var}" = "ON" ]; then |
12 | echo "Enabled" |
13 | elif [ "${var}" = "OFF" -o "${var}" = "0" -o -z "${var}" ]; then |
14 | echo "Disabled" |
15 | - elif [ "$3" = "ne" ]; then |
16 | + elif [ "${3:-""}" = "ne" ]; then |
17 | if [ "${var}" != "$4" ]; then |
18 | echo "Enabled" |
19 | else |
20 | echo "Disabled" |
21 | fi |
22 | - elif [ "$3" = "gt" ]; then |
23 | + elif [ "${3:-""}" = "gt" ]; then |
24 | if [ "${var}" -gt "$4" ]; then |
25 | echo "Enabled" |
26 | else |
27 | @@ -1032,6 +1032,21 @@ |
28 | fi |
29 | } |
30 | |
31 | +feat_on_renamed () { |
32 | + local file="$1" |
33 | + shift; |
34 | + |
35 | + for varname in "$@"; do |
36 | + local feat_on="$( feat_on "$file" $varname )" |
37 | + if [ "${feat_on:-"Not Supported"}" != "Not Supported" ]; then |
38 | + echo $feat_on |
39 | + return |
40 | + fi |
41 | + done |
42 | + |
43 | + echo "Not Supported" |
44 | +} |
45 | + |
46 | get_table_cache () { |
47 | local file="$1" |
48 | |
49 | @@ -1742,25 +1757,40 @@ |
50 | [ -e "$file" ] || return |
51 | |
52 | name_val "Table & Index Stats" \ |
53 | - "$(feat_on "$file" userstat_running)" |
54 | + "$(feat_on_renamed "$file" userstat_running userstat)" |
55 | name_val "Multiple I/O Threads" \ |
56 | "$(feat_on "$file" innodb_read_io_threads gt 1)" |
57 | + |
58 | name_val "Corruption Resilient" \ |
59 | - "$(feat_on "$file" innodb_pass_corrupt_table)" |
60 | + "$(feat_on_renamed "$file" innodb_pass_corrupt_table innodb_corrupt_table_action)" |
61 | + |
62 | name_val "Durable Replication" \ |
63 | - "$(feat_on "$file" innodb_overwrite_relay_log_info)" |
64 | + "$(feat_on_renamed "$file" innodb_overwrite_relay_log_info innodb_recovery_update_relay_log)" |
65 | + |
66 | name_val "Import InnoDB Tables" \ |
67 | - "$(feat_on "$file" innodb_expand_import)" |
68 | + "$(feat_on_renamed "$file" innodb_expand_import innodb_import_table_from_xtrabackup)" |
69 | + |
70 | name_val "Fast Server Restarts" \ |
71 | - "$(feat_on "$file" innodb_auto_lru_dump)" |
72 | + "$(feat_on_renamed "$file" innodb_auto_lru_dump innodb_buffer_pool_restore_at_startup)" |
73 | + |
74 | name_val "Enhanced Logging" \ |
75 | "$(feat_on "$file" log_slow_verbosity ne microtime)" |
76 | name_val "Replica Perf Logging" \ |
77 | "$(feat_on "$file" log_slow_slave_statements)" |
78 | + |
79 | name_val "Response Time Hist." \ |
80 | - "$(feat_on "$file" enable_query_response_time_stats)" |
81 | - name_val "Smooth Flushing" \ |
82 | - "$(feat_on "$file" innodb_adaptive_checkpoint ne none)" |
83 | + "$(feat_on_renamed "$file" enable_query_response_time_stats query_response_time_stats)" |
84 | + |
85 | + local smooth_flushing="$(feat_on_renamed "$file" innodb_adaptive_checkpoint innodb_adaptive_flushing_method)" |
86 | + if [ "${smooth_flushing:-""}" != "Not Supported" ]; then |
87 | + if [ -n "$(get_var innodb_adaptive_checkpoint "$file")" ]; then |
88 | + smooth_flushing="$(feat_on "$file" "innodb_adaptive_checkpoint" ne none)" |
89 | + else |
90 | + smooth_flushing="$(feat_on "$file" "innodb_adaptive_flushing_method" ne native)" |
91 | + fi |
92 | + fi |
93 | + name_val "Smooth Flushing" "$smooth_flushing" |
94 | + |
95 | name_val "HandlerSocket NoSQL" \ |
96 | "$(feat_on "$file" handlersocket_port)" |
97 | name_val "Fast Hash UDFs" \ |
98 | |
99 | === modified file 'lib/bash/report_mysql_info.sh' |
100 | --- lib/bash/report_mysql_info.sh 2012-08-24 23:18:36 +0000 |
101 | +++ lib/bash/report_mysql_info.sh 2012-12-04 16:22:36 +0000 |
102 | @@ -40,19 +40,19 @@ |
103 | local varname="$2" |
104 | [ -e "$file" ] || return |
105 | |
106 | - if [ "$( get_var "$varname" "${file}" )" ]; then |
107 | + if [ "$( grep "$varname" "${file}" )" ]; then |
108 | local var="$(awk "\$1 ~ /^$2$/ { print \$2 }" $file)" |
109 | if [ "${var}" = "ON" ]; then |
110 | echo "Enabled" |
111 | elif [ "${var}" = "OFF" -o "${var}" = "0" -o -z "${var}" ]; then |
112 | echo "Disabled" |
113 | - elif [ "$3" = "ne" ]; then |
114 | + elif [ "${3:-""}" = "ne" ]; then |
115 | if [ "${var}" != "$4" ]; then |
116 | echo "Enabled" |
117 | else |
118 | echo "Disabled" |
119 | fi |
120 | - elif [ "$3" = "gt" ]; then |
121 | + elif [ "${3:-""}" = "gt" ]; then |
122 | if [ "${var}" -gt "$4" ]; then |
123 | echo "Enabled" |
124 | else |
125 | @@ -68,6 +68,21 @@ |
126 | fi |
127 | } |
128 | |
129 | +feat_on_renamed () { |
130 | + local file="$1" |
131 | + shift; |
132 | + |
133 | + for varname in "$@"; do |
134 | + local feat_on="$( feat_on "$file" $varname )" |
135 | + if [ "${feat_on:-"Not Supported"}" != "Not Supported" ]; then |
136 | + echo $feat_on |
137 | + return |
138 | + fi |
139 | + done |
140 | + |
141 | + echo "Not Supported" |
142 | +} |
143 | + |
144 | get_table_cache () { |
145 | local file="$1" |
146 | |
147 | @@ -829,26 +844,50 @@ |
148 | |
149 | [ -e "$file" ] || return |
150 | |
151 | + # Renamed to userstat in 5.5.10-20.1 |
152 | name_val "Table & Index Stats" \ |
153 | - "$(feat_on "$file" userstat_running)" |
154 | + "$(feat_on_renamed "$file" userstat_running userstat)" |
155 | name_val "Multiple I/O Threads" \ |
156 | "$(feat_on "$file" innodb_read_io_threads gt 1)" |
157 | + |
158 | + # Renamed to innodb_corrupt_table_action in 5.5.10-20.1 |
159 | name_val "Corruption Resilient" \ |
160 | - "$(feat_on "$file" innodb_pass_corrupt_table)" |
161 | + "$(feat_on_renamed "$file" innodb_pass_corrupt_table innodb_corrupt_table_action)" |
162 | + |
163 | + # Renamed to innodb_recovery_update_relay_log in 5.5.10-20.1 |
164 | name_val "Durable Replication" \ |
165 | - "$(feat_on "$file" innodb_overwrite_relay_log_info)" |
166 | + "$(feat_on_renamed "$file" innodb_overwrite_relay_log_info innodb_recovery_update_relay_log)" |
167 | + |
168 | + # Renamed to innodb_import_table_from_xtrabackup in 5.5.10-20.1 |
169 | name_val "Import InnoDB Tables" \ |
170 | - "$(feat_on "$file" innodb_expand_import)" |
171 | + "$(feat_on_renamed "$file" innodb_expand_import innodb_import_table_from_xtrabackup)" |
172 | + |
173 | + # Renamed to innodb_buffer_pool_restore_at_startup in 5.5.10-20.1 |
174 | name_val "Fast Server Restarts" \ |
175 | - "$(feat_on "$file" innodb_auto_lru_dump)" |
176 | + "$(feat_on_renamed "$file" innodb_auto_lru_dump innodb_buffer_pool_restore_at_startup)" |
177 | + |
178 | name_val "Enhanced Logging" \ |
179 | "$(feat_on "$file" log_slow_verbosity ne microtime)" |
180 | name_val "Replica Perf Logging" \ |
181 | "$(feat_on "$file" log_slow_slave_statements)" |
182 | + |
183 | + # Renamed to query_response_time_stats in 5.5 |
184 | name_val "Response Time Hist." \ |
185 | - "$(feat_on "$file" enable_query_response_time_stats)" |
186 | - name_val "Smooth Flushing" \ |
187 | - "$(feat_on "$file" innodb_adaptive_checkpoint ne none)" |
188 | + "$(feat_on_renamed "$file" enable_query_response_time_stats query_response_time_stats)" |
189 | + |
190 | + # Renamed to innodb_adaptive_flushing_method in 5.5 |
191 | + # This one is a bit more convulted than the rest because not only did it |
192 | + # change names, but also default values: none in 5.1, native in 5.5 |
193 | + local smooth_flushing="$(feat_on_renamed "$file" innodb_adaptive_checkpoint innodb_adaptive_flushing_method)" |
194 | + if [ "${smooth_flushing:-""}" != "Not Supported" ]; then |
195 | + if [ -n "$(get_var innodb_adaptive_checkpoint "$file")" ]; then |
196 | + smooth_flushing="$(feat_on "$file" "innodb_adaptive_checkpoint" ne none)" |
197 | + else |
198 | + smooth_flushing="$(feat_on "$file" "innodb_adaptive_flushing_method" ne native)" |
199 | + fi |
200 | + fi |
201 | + name_val "Smooth Flushing" "$smooth_flushing" |
202 | + |
203 | name_val "HandlerSocket NoSQL" \ |
204 | "$(feat_on "$file" handlersocket_port)" |
205 | name_val "Fast Hash UDFs" \ |
206 | |
207 | === modified file 't/lib/bash/report_mysql_info.sh' |
208 | --- t/lib/bash/report_mysql_info.sh 2012-10-24 19:36:32 +0000 |
209 | +++ t/lib/bash/report_mysql_info.sh 2012-12-04 16:22:36 +0000 |
210 | @@ -1,6 +1,6 @@ |
211 | #!/usr/bin/env bash |
212 | |
213 | -plan 33 |
214 | +plan 36 |
215 | |
216 | . "$LIB_DIR/alt_cmds.sh" |
217 | . "$LIB_DIR/log_warn_die.sh" |
218 | @@ -730,5 +730,30 @@ |
219 | "report_mysql_summary, dir: temp004" |
220 | |
221 | # ########################################################################### |
222 | +# pt-mysql-summary not Percona Server 5.5-ready |
223 | +# https://bugs.launchpad.net/percona-toolkit/+bug/1015590 |
224 | +# ########################################################################### |
225 | + |
226 | +section_percona_server_features "$samples/percona-server-5.5-variables" > "$PT_TMPDIR/got" |
227 | + |
228 | +no_diff \ |
229 | + "$PT_TMPDIR/got" \ |
230 | + "$samples/expected_output_ps-features.txt" \ |
231 | + "Bug 1015590: pt-mysql-summary not Percona Server 5.5-ready" |
232 | + |
233 | +section_percona_server_features "$samples/percona-server-5.1-variables" > "$PT_TMPDIR/got" |
234 | +no_diff \ |
235 | + "$PT_TMPDIR/got" \ |
236 | + "$samples/expected_output_ps-5.1-features.txt" \ |
237 | + "Bug 1015590: section_percona_server_features works on 5.1 with innodb_adaptive_checkpoint=none" |
238 | + |
239 | +section_percona_server_features "$samples/percona-server-5.1-variables-martin" > "$PT_TMPDIR/got" |
240 | +cp "$PT_TMPDIR/got" /tmp/dasgot |
241 | +no_diff \ |
242 | + "$PT_TMPDIR/got" \ |
243 | + "$samples/expected_output_ps-5.1-martin.txt" \ |
244 | + "section_percona_server_features works on 5.1" |
245 | + |
246 | +# ########################################################################### |
247 | # Done |
248 | # ########################################################################### |
249 | |
250 | === added file 't/pt-mysql-summary/samples/expected_output_ps-5.1-features.txt' |
251 | --- t/pt-mysql-summary/samples/expected_output_ps-5.1-features.txt 1970-01-01 00:00:00 +0000 |
252 | +++ t/pt-mysql-summary/samples/expected_output_ps-5.1-features.txt 2012-12-04 16:22:36 +0000 |
253 | @@ -0,0 +1,12 @@ |
254 | + Table & Index Stats | Disabled |
255 | + Multiple I/O Threads | Enabled |
256 | + Corruption Resilient | Disabled |
257 | + Durable Replication | Disabled |
258 | + Import InnoDB Tables | Disabled |
259 | + Fast Server Restarts | Disabled |
260 | + Enhanced Logging | Enabled |
261 | + Replica Perf Logging | Disabled |
262 | + Response Time Hist. | Disabled |
263 | + Smooth Flushing | Disabled |
264 | + HandlerSocket NoSQL | Not Supported |
265 | + Fast Hash UDFs | Unknown |
266 | |
267 | === added file 't/pt-mysql-summary/samples/expected_output_ps-5.1-martin.txt' |
268 | --- t/pt-mysql-summary/samples/expected_output_ps-5.1-martin.txt 1970-01-01 00:00:00 +0000 |
269 | +++ t/pt-mysql-summary/samples/expected_output_ps-5.1-martin.txt 2012-12-04 16:22:36 +0000 |
270 | @@ -0,0 +1,12 @@ |
271 | + Table & Index Stats | Disabled |
272 | + Multiple I/O Threads | Enabled |
273 | + Corruption Resilient | Disabled |
274 | + Durable Replication | Disabled |
275 | + Import InnoDB Tables | Disabled |
276 | + Fast Server Restarts | Disabled |
277 | + Enhanced Logging | Disabled |
278 | + Replica Perf Logging | Disabled |
279 | + Response Time Hist. | Disabled |
280 | + Smooth Flushing | Enabled |
281 | + HandlerSocket NoSQL | Not Supported |
282 | + Fast Hash UDFs | |
283 | |
284 | === added file 't/pt-mysql-summary/samples/expected_output_ps-features.txt' |
285 | --- t/pt-mysql-summary/samples/expected_output_ps-features.txt 1970-01-01 00:00:00 +0000 |
286 | +++ t/pt-mysql-summary/samples/expected_output_ps-features.txt 2012-12-04 16:22:36 +0000 |
287 | @@ -0,0 +1,12 @@ |
288 | + Table & Index Stats | Disabled |
289 | + Multiple I/O Threads | Enabled |
290 | + Corruption Resilient | Enabled |
291 | + Durable Replication | Disabled |
292 | + Import InnoDB Tables | Disabled |
293 | + Fast Server Restarts | Disabled |
294 | + Enhanced Logging | Disabled |
295 | + Replica Perf Logging | Disabled |
296 | + Response Time Hist. | Disabled |
297 | + Smooth Flushing | Enabled |
298 | + HandlerSocket NoSQL | Not Supported |
299 | + Fast Hash UDFs | Unknown |
300 | |
301 | === modified file 't/pt-mysql-summary/samples/expected_output_temp002.txt' |
302 | --- t/pt-mysql-summary/samples/expected_output_temp002.txt 2012-03-31 02:00:57 +0000 |
303 | +++ t/pt-mysql-summary/samples/expected_output_temp002.txt 2012-12-04 16:22:36 +0000 |
304 | @@ -111,16 +111,16 @@ |
305 | Size | 400 |
306 | Usage | 10% |
307 | # Key Percona Server features ################################ |
308 | - Table & Index Stats | Not Supported |
309 | + Table & Index Stats | Disabled |
310 | Multiple I/O Threads | Enabled |
311 | - Corruption Resilient | Not Supported |
312 | - Durable Replication | Not Supported |
313 | - Import InnoDB Tables | Not Supported |
314 | - Fast Server Restarts | Not Supported |
315 | - Enhanced Logging | Not Supported |
316 | + Corruption Resilient | Enabled |
317 | + Durable Replication | Disabled |
318 | + Import InnoDB Tables | Disabled |
319 | + Fast Server Restarts | Disabled |
320 | + Enhanced Logging | Disabled |
321 | Replica Perf Logging | Disabled |
322 | - Response Time Hist. | Not Supported |
323 | - Smooth Flushing | Not Supported |
324 | + Response Time Hist. | Disabled |
325 | + Smooth Flushing | Enabled |
326 | HandlerSocket NoSQL | Not Supported |
327 | Fast Hash UDFs | Unknown |
328 | # Plugins #################################################### |
329 | |
330 | === added file 't/pt-mysql-summary/samples/percona-server-5.1-variables' |
331 | --- t/pt-mysql-summary/samples/percona-server-5.1-variables 1970-01-01 00:00:00 +0000 |
332 | +++ t/pt-mysql-summary/samples/percona-server-5.1-variables 2012-12-04 16:22:36 +0000 |
333 | @@ -0,0 +1,363 @@ |
334 | +auto_increment_increment 1 |
335 | +auto_increment_offset 1 |
336 | +autocommit ON |
337 | +automatic_sp_privileges ON |
338 | +back_log 50 |
339 | +basedir /home/hugmeir/mysql5/mysqlbrew/mysqls/Percona-Server-5.1/ |
340 | +big_tables OFF |
341 | +binlog_cache_size 32768 |
342 | +binlog_direct_non_transactional_updates OFF |
343 | +binlog_format STATEMENT |
344 | +bulk_insert_buffer_size 8388608 |
345 | +character_set_client latin1 |
346 | +character_set_connection latin1 |
347 | +character_set_database latin1 |
348 | +character_set_filesystem binary |
349 | +character_set_results latin1 |
350 | +character_set_server latin1 |
351 | +character_set_system utf8 |
352 | +character_sets_dir /home/hugmeir/mysql5/mysqlbrew/mysqls/Percona-Server-5.1/share/mysql/charsets/ |
353 | +collation_connection latin1_swedish_ci |
354 | +collation_database latin1_swedish_ci |
355 | +collation_server latin1_swedish_ci |
356 | +completion_type 0 |
357 | +concurrent_insert 1 |
358 | +connect_timeout 10 |
359 | +datadir /tmp/12345/data/ |
360 | +date_format %Y-%m-%d |
361 | +datetime_format %Y-%m-%d %H:%i:%s |
362 | +default_week_format 0 |
363 | +delay_key_write ON |
364 | +delayed_insert_limit 100 |
365 | +delayed_insert_timeout 300 |
366 | +delayed_queue_size 1000 |
367 | +div_precision_increment 4 |
368 | +enable_query_response_time_stats OFF |
369 | +engine_condition_pushdown ON |
370 | +error_count 0 |
371 | +event_scheduler OFF |
372 | +expand_fast_index_creation OFF |
373 | +expire_logs_days 0 |
374 | +fast_index_creation ON |
375 | +flush OFF |
376 | +flush_time 0 |
377 | +foreign_key_checks ON |
378 | +ft_boolean_syntax + -><()~*:""&| |
379 | +ft_max_word_len 84 |
380 | +ft_min_word_len 4 |
381 | +ft_query_expansion_limit 20 |
382 | +ft_stopword_file (built-in) |
383 | +general_log OFF |
384 | +general_log_file /tmp/12345/data/mysql_sandbox12345.log |
385 | +group_concat_max_len 1024 |
386 | +have_community_features YES |
387 | +have_compress YES |
388 | +have_crypt YES |
389 | +have_csv YES |
390 | +have_dynamic_loading YES |
391 | +have_geometry YES |
392 | +have_innodb YES |
393 | +have_ndbcluster NO |
394 | +have_openssl DISABLED |
395 | +have_partitioning YES |
396 | +have_query_cache YES |
397 | +have_response_time_distribution YES |
398 | +have_rtree_keys YES |
399 | +have_ssl DISABLED |
400 | +have_symlink YES |
401 | +hostname hugmeir |
402 | +identity 0 |
403 | +ignore_builtin_innodb OFF |
404 | +init_connect |
405 | +init_file |
406 | +init_slave |
407 | +innodb_adaptive_checkpoint none |
408 | +innodb_adaptive_flushing OFF |
409 | +innodb_adaptive_hash_index ON |
410 | +innodb_additional_mem_pool_size 8388608 |
411 | +innodb_auto_lru_dump 0 |
412 | +innodb_autoextend_increment 8 |
413 | +innodb_autoinc_lock_mode 1 |
414 | +innodb_blocking_lru_restore OFF |
415 | +innodb_buffer_pool_shm_checksum ON |
416 | +innodb_buffer_pool_shm_key 0 |
417 | +innodb_buffer_pool_size 33554432 |
418 | +innodb_change_buffering inserts |
419 | +innodb_checkpoint_age_target 0 |
420 | +innodb_checksums ON |
421 | +innodb_commit_concurrency 0 |
422 | +innodb_concurrency_tickets 500 |
423 | +innodb_data_file_path ibdata1:10M:autoextend |
424 | +innodb_data_home_dir /tmp/12345/data |
425 | +innodb_dict_size_limit 0 |
426 | +innodb_doublewrite ON |
427 | +innodb_doublewrite_file |
428 | +innodb_enable_unsafe_group_commit 0 |
429 | +innodb_expand_import 0 |
430 | +innodb_extra_rsegments 0 |
431 | +innodb_extra_undoslots OFF |
432 | +innodb_fake_changes OFF |
433 | +innodb_fast_checksum OFF |
434 | +innodb_fast_recovery OFF |
435 | +innodb_fast_shutdown 1 |
436 | +innodb_file_format Antelope |
437 | +innodb_file_format_check Antelope |
438 | +innodb_file_per_table OFF |
439 | +innodb_flush_log_at_trx_commit 1 |
440 | +innodb_flush_log_at_trx_commit_session 3 |
441 | +innodb_flush_method |
442 | +innodb_flush_neighbor_pages 1 |
443 | +innodb_force_recovery 0 |
444 | +innodb_ibuf_accel_rate 100 |
445 | +innodb_ibuf_active_contract 1 |
446 | +innodb_ibuf_max_size 16760832 |
447 | +innodb_io_capacity 200 |
448 | +innodb_kill_idle_transaction 0 |
449 | +innodb_lazy_drop_table 0 |
450 | +innodb_lock_wait_timeout 3 |
451 | +innodb_locks_unsafe_for_binlog OFF |
452 | +innodb_log_block_size 512 |
453 | +innodb_log_buffer_size 8388608 |
454 | +innodb_log_file_size 5242880 |
455 | +innodb_log_files_in_group 2 |
456 | +innodb_log_group_home_dir /tmp/12345/data |
457 | +innodb_max_dirty_pages_pct 75 |
458 | +innodb_max_purge_lag 0 |
459 | +innodb_mirrored_log_groups 1 |
460 | +innodb_old_blocks_pct 37 |
461 | +innodb_old_blocks_time 0 |
462 | +innodb_open_files 300 |
463 | +innodb_overwrite_relay_log_info OFF |
464 | +innodb_page_size 16384 |
465 | +innodb_pass_corrupt_table 0 |
466 | +innodb_random_read_ahead OFF |
467 | +innodb_read_ahead linear |
468 | +innodb_read_ahead_threshold 56 |
469 | +innodb_read_io_threads 4 |
470 | +innodb_recovery_stats OFF |
471 | +innodb_replication_delay 0 |
472 | +innodb_rollback_on_timeout OFF |
473 | +innodb_show_locks_held 10 |
474 | +innodb_show_verbose_locks 0 |
475 | +innodb_spin_wait_delay 6 |
476 | +innodb_stats_auto_update 1 |
477 | +innodb_stats_method nulls_equal |
478 | +innodb_stats_on_metadata ON |
479 | +innodb_stats_sample_pages 8 |
480 | +innodb_stats_update_need_lock 1 |
481 | +innodb_strict_mode OFF |
482 | +innodb_support_xa ON |
483 | +innodb_sync_spin_loops 30 |
484 | +innodb_table_locks ON |
485 | +innodb_thread_concurrency 0 |
486 | +innodb_thread_concurrency_timer_based OFF |
487 | +innodb_thread_sleep_delay 10000 |
488 | +innodb_use_purge_thread 1 |
489 | +innodb_use_sys_malloc ON |
490 | +innodb_use_sys_stats_table OFF |
491 | +innodb_version 1.0.17-13.2 |
492 | +innodb_write_io_threads 4 |
493 | +insert_id 0 |
494 | +interactive_timeout 28800 |
495 | +join_buffer_size 131072 |
496 | +keep_files_on_create OFF |
497 | +key_buffer_size 16777216 |
498 | +key_cache_age_threshold 300 |
499 | +key_cache_block_size 1024 |
500 | +key_cache_division_limit 100 |
501 | +language /home/hugmeir/mysql5/mysqlbrew/mysqls/Percona-Server-5.1/share/mysql/english/ |
502 | +large_files_support ON |
503 | +large_page_size 0 |
504 | +large_pages OFF |
505 | +last_insert_id 0 |
506 | +lc_time_names en_US |
507 | +license GPL |
508 | +local_infile ON |
509 | +locked_in_memory OFF |
510 | +log OFF |
511 | +log_bin ON |
512 | +log_bin_trust_function_creators OFF |
513 | +log_bin_trust_routine_creators OFF |
514 | +log_error /tmp/12345/data/mysqld.log |
515 | +log_output FILE |
516 | +log_queries_not_using_indexes OFF |
517 | +log_slave_updates ON |
518 | +log_slow_admin_statements OFF |
519 | +log_slow_filter |
520 | +log_slow_queries OFF |
521 | +log_slow_rate_limit 1 |
522 | +log_slow_slave_statements OFF |
523 | +log_slow_sp_statements ON |
524 | +log_slow_timestamp_every OFF |
525 | +log_slow_verbosity full |
526 | +log_warnings 1 |
527 | +long_query_time 10.000000 |
528 | +low_priority_updates OFF |
529 | +lower_case_file_system OFF |
530 | +lower_case_table_names 0 |
531 | +max_allowed_packet 1048576 |
532 | +max_binlog_cache_size 4294963200 |
533 | +max_binlog_size 1073741824 |
534 | +max_connect_errors 10 |
535 | +max_connections 151 |
536 | +max_delayed_threads 20 |
537 | +max_error_count 64 |
538 | +max_heap_table_size 16777216 |
539 | +max_insert_delayed_threads 20 |
540 | +max_join_size 4294967295 |
541 | +max_length_for_sort_data 1024 |
542 | +max_long_data_size 1048576 |
543 | +max_prepared_stmt_count 16382 |
544 | +max_relay_log_size 0 |
545 | +max_seeks_for_key 4294967295 |
546 | +max_sort_length 1024 |
547 | +max_sp_recursion_depth 0 |
548 | +max_tmp_tables 32 |
549 | +max_user_connections 0 |
550 | +max_write_lock_count 4294967295 |
551 | +min_examined_row_limit 0 |
552 | +multi_range_count 256 |
553 | +myisam_data_pointer_size 6 |
554 | +myisam_max_sort_file_size 2146435072 |
555 | +myisam_mmap_size 4294967295 |
556 | +myisam_recover_options OFF |
557 | +myisam_repair_threads 1 |
558 | +myisam_sort_buffer_size 8388608 |
559 | +myisam_stats_method nulls_unequal |
560 | +myisam_use_mmap OFF |
561 | +net_buffer_length 16384 |
562 | +net_read_timeout 30 |
563 | +net_retry_count 10 |
564 | +net_write_timeout 60 |
565 | +new OFF |
566 | +old OFF |
567 | +old_alter_table OFF |
568 | +old_passwords OFF |
569 | +open_files_limit 1024 |
570 | +optimizer_fix ON |
571 | +optimizer_prune_level 1 |
572 | +optimizer_search_depth 62 |
573 | +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on |
574 | +pid_file /tmp/12345/data/mysql_sandbox12345.pid |
575 | +plugin_dir /home/hugmeir/mysql5/mysqlbrew/mysqls/Percona-Server-5.1/lib/mysql/plugin |
576 | +port 12345 |
577 | +preload_buffer_size 32768 |
578 | +profiling OFF |
579 | +profiling_history_size 15 |
580 | +profiling_server OFF |
581 | +profiling_use_getrusage OFF |
582 | +protocol_version 10 |
583 | +pseudo_thread_id 0 |
584 | +query_alloc_block_size 8192 |
585 | +query_cache_limit 1048576 |
586 | +query_cache_min_res_unit 4096 |
587 | +query_cache_size 0 |
588 | +query_cache_strip_comments OFF |
589 | +query_cache_type ON |
590 | +query_cache_wlock_invalidate OFF |
591 | +query_prealloc_size 8192 |
592 | +query_response_time_range_base 10 |
593 | +rand_seed1 |
594 | +rand_seed2 |
595 | +range_alloc_block_size 4096 |
596 | +read_buffer_size 131072 |
597 | +read_only OFF |
598 | +read_rnd_buffer_size 262144 |
599 | +relay_log mysql-relay-bin |
600 | +relay_log_index |
601 | +relay_log_info_file relay-log.info |
602 | +relay_log_purge ON |
603 | +relay_log_space_limit 0 |
604 | +report_host 127.0.0.1 |
605 | +report_password |
606 | +report_port 12345 |
607 | +report_user |
608 | +rpl_recovery_rank 0 |
609 | +secure_auth OFF |
610 | +secure_file_priv |
611 | +server_id 12345 |
612 | +skip_external_locking ON |
613 | +skip_name_resolve OFF |
614 | +skip_networking OFF |
615 | +skip_show_database OFF |
616 | +slave_compressed_protocol OFF |
617 | +slave_exec_mode STRICT |
618 | +slave_load_tmpdir /tmp |
619 | +slave_net_timeout 3600 |
620 | +slave_skip_errors OFF |
621 | +slave_transaction_retries 10 |
622 | +slow_launch_time 2 |
623 | +slow_query_log OFF |
624 | +slow_query_log_file /tmp/12345/data/mysql_sandbox12345-slow.log |
625 | +slow_query_log_microseconds_timestamp OFF |
626 | +socket /tmp/12345/mysql_sandbox12345.sock |
627 | +sort_buffer_size 2097144 |
628 | +sql_auto_is_null ON |
629 | +sql_big_selects ON |
630 | +sql_big_tables OFF |
631 | +sql_buffer_result OFF |
632 | +sql_log_bin ON |
633 | +sql_log_off OFF |
634 | +sql_log_update ON |
635 | +sql_low_priority_updates OFF |
636 | +sql_max_join_size 4294967295 |
637 | +sql_mode |
638 | +sql_notes ON |
639 | +sql_quote_show_create ON |
640 | +sql_safe_updates OFF |
641 | +sql_select_limit 4294967295 |
642 | +sql_slave_skip_counter |
643 | +sql_warnings OFF |
644 | +ssl_ca |
645 | +ssl_capath |
646 | +ssl_cert |
647 | +ssl_cipher |
648 | +ssl_key |
649 | +storage_engine MyISAM |
650 | +suppress_log_warning_1592 OFF |
651 | +sync_binlog 0 |
652 | +sync_frm ON |
653 | +system_time_zone ART |
654 | +table_definition_cache 256 |
655 | +table_lock_wait_timeout 50 |
656 | +table_open_cache 64 |
657 | +table_type MyISAM |
658 | +thread_cache_size 0 |
659 | +thread_handling one-thread-per-connection |
660 | +thread_stack 196608 |
661 | +thread_statistics OFF |
662 | +time_format %H:%i:%s |
663 | +time_zone SYSTEM |
664 | +timed_mutexes OFF |
665 | +timestamp 1333157599 |
666 | +tmp_table_size 16777216 |
667 | +tmpdir /tmp |
668 | +transaction_alloc_block_size 8192 |
669 | +transaction_prealloc_size 4096 |
670 | +tx_isolation REPEATABLE-READ |
671 | +unique_checks ON |
672 | +updatable_views_with_limit YES |
673 | +use_global_log_slow_control none |
674 | +use_global_long_query_time OFF |
675 | +userstat_running OFF |
676 | +version 5.1.61rel13.2-log |
677 | +version_comment Percona Server with XtraDB (GPL), Release rel13.2, Revision 430 |
678 | +version_compile_machine i686 |
679 | +version_compile_os pc-linux-gnu |
680 | +wait_timeout 28800 |
681 | +warning_count 0 |
682 | +internal::nice_of_2750 0 |
683 | +internal::oom_of_2750 0 |
684 | +internal::nice_of_2571 0 |
685 | +internal::oom_of_2571 0 |
686 | +internal::nice_of_2406 0 |
687 | +internal::oom_of_2406 0 |
688 | +pt-summary-internal-current_time 2012-03-30 21:45 |
689 | +pt-summary-internal-Config_File_path /tmp/12345/my.sandbox.cnf |
690 | +pt-summary-internal-mysql_executable /home/hugmeir/mysql5/mysqlbrew/mysqls/Percona-Server-5.1/bin/mysql |
691 | +pt-summary-internal-now 2012-03-30 22:33:19 |
692 | +pt-summary-internal-user msandbox@% |
693 | +pt-summary-internal-FNV_64 Unknown |
694 | +pt-summary-internal-trigger_count 6 |
695 | +pt-summary-internal-mysqld_executable_1 Yes |
696 | +pt-summary-internal-pid_file_exists 1 |
697 | |
698 | === added file 't/pt-mysql-summary/samples/percona-server-5.1-variables-martin' |
699 | --- t/pt-mysql-summary/samples/percona-server-5.1-variables-martin 1970-01-01 00:00:00 +0000 |
700 | +++ t/pt-mysql-summary/samples/percona-server-5.1-variables-martin 2012-12-04 16:22:36 +0000 |
701 | @@ -0,0 +1,353 @@ |
702 | +auto_increment_increment 1 |
703 | +auto_increment_offset 1 |
704 | +autocommit ON |
705 | +automatic_sp_privileges ON |
706 | +back_log 50 |
707 | +basedir /home/martin/mysqlversions/percona/percona-5.1.66/ |
708 | +big_tables OFF |
709 | +binlog_cache_size 32768 |
710 | +binlog_direct_non_transactional_updates OFF |
711 | +binlog_format STATEMENT |
712 | +bulk_insert_buffer_size 8388608 |
713 | +character_set_client utf8 |
714 | +character_set_connection utf8 |
715 | +character_set_database utf8 |
716 | +character_set_filesystem binary |
717 | +character_set_results utf8 |
718 | +character_set_server utf8 |
719 | +character_set_system utf8 |
720 | +character_sets_dir /home/martin/mysqlversions/percona/percona-5.1.66/share/mysql/charsets/ |
721 | +collation_connection utf8_general_ci |
722 | +collation_database utf8_general_ci |
723 | +collation_server utf8_general_ci |
724 | +completion_type 0 |
725 | +concurrent_insert 1 |
726 | +connect_timeout 10 |
727 | +datadir /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/data/ |
728 | +date_format %Y-%m-%d |
729 | +datetime_format %Y-%m-%d %H:%i:%s |
730 | +default_week_format 0 |
731 | +delay_key_write ON |
732 | +delayed_insert_limit 100 |
733 | +delayed_insert_timeout 300 |
734 | +delayed_queue_size 1000 |
735 | +div_precision_increment 4 |
736 | +enable_query_response_time_stats OFF |
737 | +engine_condition_pushdown ON |
738 | +error_count 0 |
739 | +event_scheduler OFF |
740 | +expand_fast_index_creation OFF |
741 | +expire_logs_days 0 |
742 | +fast_index_creation ON |
743 | +flush OFF |
744 | +flush_time 0 |
745 | +foreign_key_checks ON |
746 | +ft_boolean_syntax + -><()~*:""&| |
747 | +ft_max_word_len 84 |
748 | +ft_min_word_len 4 |
749 | +ft_query_expansion_limit 20 |
750 | +ft_stopword_file (built-in) |
751 | +general_log OFF |
752 | +general_log_file /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/data/mysql_sandbox5166.log |
753 | +group_concat_max_len 1024 |
754 | +have_community_features YES |
755 | +have_compress YES |
756 | +have_crypt YES |
757 | +have_csv YES |
758 | +have_dynamic_loading YES |
759 | +have_flashcache YES |
760 | +have_geometry YES |
761 | +have_innodb YES |
762 | +have_ndbcluster NO |
763 | +have_openssl DISABLED |
764 | +have_partitioning YES |
765 | +have_query_cache YES |
766 | +have_response_time_distribution YES |
767 | +have_rtree_keys YES |
768 | +have_ssl DISABLED |
769 | +have_symlink YES |
770 | +hostname perconatest |
771 | +identity 0 |
772 | +ignore_builtin_innodb OFF |
773 | +init_connect |
774 | +init_file |
775 | +init_slave |
776 | +innodb_adaptive_checkpoint estimate |
777 | +innodb_adaptive_flushing OFF |
778 | +innodb_adaptive_hash_index ON |
779 | +innodb_additional_mem_pool_size 8388608 |
780 | +innodb_auto_lru_dump 0 |
781 | +innodb_autoextend_increment 8 |
782 | +innodb_autoinc_lock_mode 1 |
783 | +innodb_blocking_lru_restore OFF |
784 | +innodb_buffer_pool_shm_checksum ON |
785 | +innodb_buffer_pool_shm_key 0 |
786 | +innodb_buffer_pool_size 134217728 |
787 | +innodb_change_buffering inserts |
788 | +innodb_changed_pages_limit 1000000 |
789 | +innodb_checkpoint_age_target 0 |
790 | +innodb_checksums ON |
791 | +innodb_commit_concurrency 0 |
792 | +innodb_concurrency_tickets 500 |
793 | +innodb_data_file_path ibdata1:10M:autoextend |
794 | +innodb_data_home_dir |
795 | +innodb_dict_size_limit 0 |
796 | +innodb_doublewrite ON |
797 | +innodb_doublewrite_file |
798 | +innodb_enable_unsafe_group_commit 0 |
799 | +innodb_expand_import 0 |
800 | +innodb_extra_rsegments 0 |
801 | +innodb_extra_undoslots OFF |
802 | +innodb_fake_changes OFF |
803 | +innodb_fast_checksum OFF |
804 | +innodb_fast_recovery OFF |
805 | +innodb_fast_shutdown 1 |
806 | +innodb_file_format Antelope |
807 | +innodb_file_format_check Barracuda |
808 | +innodb_file_per_table OFF |
809 | +innodb_flush_log_at_trx_commit 1 |
810 | +innodb_flush_log_at_trx_commit_session 3 |
811 | +innodb_flush_method |
812 | +innodb_flush_neighbor_pages 1 |
813 | +innodb_force_recovery 0 |
814 | +innodb_ibuf_accel_rate 100 |
815 | +innodb_ibuf_active_contract 1 |
816 | +innodb_ibuf_max_size 67092480 |
817 | +innodb_io_capacity 200 |
818 | +innodb_kill_idle_transaction 0 |
819 | +innodb_lazy_drop_table 0 |
820 | +innodb_lock_wait_timeout 50 |
821 | +innodb_locks_unsafe_for_binlog OFF |
822 | +innodb_log_block_size 512 |
823 | +innodb_log_buffer_size 8388608 |
824 | +innodb_log_file_size 5242880 |
825 | +innodb_log_files_in_group 2 |
826 | +innodb_log_group_home_dir ./ |
827 | +innodb_max_dirty_pages_pct 75 |
828 | +innodb_max_purge_lag 0 |
829 | +innodb_mirrored_log_groups 1 |
830 | +innodb_old_blocks_pct 37 |
831 | +innodb_old_blocks_time 0 |
832 | +innodb_open_files 300 |
833 | +innodb_overwrite_relay_log_info OFF |
834 | +innodb_page_size 16384 |
835 | +innodb_pass_corrupt_table 0 |
836 | +innodb_random_read_ahead OFF |
837 | +innodb_read_ahead linear |
838 | +innodb_read_ahead_threshold 56 |
839 | +innodb_read_io_threads 4 |
840 | +innodb_recovery_stats OFF |
841 | +innodb_replication_delay 0 |
842 | +innodb_rollback_on_timeout OFF |
843 | +innodb_show_locks_held 10 |
844 | +innodb_show_verbose_locks 0 |
845 | +innodb_spin_wait_delay 6 |
846 | +innodb_stats_auto_update 1 |
847 | +innodb_stats_method nulls_equal |
848 | +innodb_stats_on_metadata ON |
849 | +innodb_stats_sample_pages 8 |
850 | +innodb_stats_update_need_lock 1 |
851 | +innodb_strict_mode OFF |
852 | +innodb_support_xa ON |
853 | +innodb_sync_spin_loops 30 |
854 | +innodb_table_locks ON |
855 | +innodb_thread_concurrency 0 |
856 | +innodb_thread_concurrency_timer_based OFF |
857 | +innodb_thread_sleep_delay 10000 |
858 | +innodb_track_changed_pages OFF |
859 | +innodb_use_purge_thread 1 |
860 | +innodb_use_sys_malloc ON |
861 | +innodb_use_sys_stats_table OFF |
862 | +innodb_version 1.0.17-14.1 |
863 | +innodb_write_io_threads 4 |
864 | +insert_id 0 |
865 | +interactive_timeout 28800 |
866 | +join_buffer_size 131072 |
867 | +keep_files_on_create OFF |
868 | +key_buffer_size 8384512 |
869 | +key_cache_age_threshold 300 |
870 | +key_cache_block_size 1024 |
871 | +key_cache_division_limit 100 |
872 | +language /home/martin/mysqlversions/percona/percona-5.1.66/share/mysql/english/ |
873 | +large_files_support ON |
874 | +large_page_size 0 |
875 | +large_pages OFF |
876 | +last_insert_id 0 |
877 | +lc_time_names en_US |
878 | +license GPL |
879 | +local_infile ON |
880 | +locked_in_memory OFF |
881 | +log OFF |
882 | +log_bin OFF |
883 | +log_bin_trust_function_creators OFF |
884 | +log_bin_trust_routine_creators OFF |
885 | +log_error /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/data/msandbox.err |
886 | +log_output FILE |
887 | +log_queries_not_using_indexes OFF |
888 | +log_slave_updates OFF |
889 | +log_slow_admin_statements OFF |
890 | +log_slow_filter |
891 | +log_slow_queries OFF |
892 | +log_slow_rate_limit 1 |
893 | +log_slow_slave_statements OFF |
894 | +log_slow_sp_statements ON |
895 | +log_slow_timestamp_every OFF |
896 | +log_slow_verbosity microtime |
897 | +log_warnings 1 |
898 | +long_query_time 10.000000 |
899 | +low_priority_updates OFF |
900 | +lower_case_file_system OFF |
901 | +lower_case_table_names 0 |
902 | +max_allowed_packet 1048576 |
903 | +max_binlog_cache_size 18446744073709547520 |
904 | +max_binlog_size 1073741824 |
905 | +max_connect_errors 10 |
906 | +max_connections 151 |
907 | +max_delayed_threads 20 |
908 | +max_error_count 64 |
909 | +max_heap_table_size 16777216 |
910 | +max_insert_delayed_threads 20 |
911 | +max_join_size 18446744073709551615 |
912 | +max_length_for_sort_data 1024 |
913 | +max_long_data_size 1048576 |
914 | +max_prepared_stmt_count 16382 |
915 | +max_relay_log_size 0 |
916 | +max_seeks_for_key 18446744073709551615 |
917 | +max_sort_length 1024 |
918 | +max_sp_recursion_depth 0 |
919 | +max_tmp_tables 32 |
920 | +max_user_connections 0 |
921 | +max_write_lock_count 18446744073709551615 |
922 | +min_examined_row_limit 0 |
923 | +multi_range_count 256 |
924 | +myisam_data_pointer_size 6 |
925 | +myisam_max_sort_file_size 9223372036853727232 |
926 | +myisam_mmap_size 18446744073709551615 |
927 | +myisam_recover_options OFF |
928 | +myisam_repair_threads 1 |
929 | +myisam_sort_buffer_size 8388608 |
930 | +myisam_stats_method nulls_unequal |
931 | +myisam_use_mmap OFF |
932 | +net_buffer_length 16384 |
933 | +net_read_timeout 30 |
934 | +net_retry_count 10 |
935 | +net_write_timeout 60 |
936 | +new OFF |
937 | +old OFF |
938 | +old_alter_table OFF |
939 | +old_passwords OFF |
940 | +open_files_limit 1024 |
941 | +optimizer_fix ON |
942 | +optimizer_prune_level 1 |
943 | +optimizer_search_depth 62 |
944 | +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on |
945 | +pid_file /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/data/mysql_sandbox5166.pid |
946 | +plugin_dir /home/martin/mysqlversions/percona/percona-5.1.66/lib/mysql/plugin |
947 | +port 5166 |
948 | +preload_buffer_size 32768 |
949 | +profiling OFF |
950 | +profiling_history_size 15 |
951 | +profiling_server OFF |
952 | +profiling_use_getrusage OFF |
953 | +protocol_version 10 |
954 | +pseudo_thread_id 0 |
955 | +query_alloc_block_size 8192 |
956 | +query_cache_limit 1048576 |
957 | +query_cache_min_res_unit 4096 |
958 | +query_cache_size 0 |
959 | +query_cache_strip_comments OFF |
960 | +query_cache_type ON |
961 | +query_cache_wlock_invalidate OFF |
962 | +query_prealloc_size 8192 |
963 | +query_response_time_range_base 10 |
964 | +rand_seed1 |
965 | +rand_seed2 |
966 | +range_alloc_block_size 4096 |
967 | +read_buffer_size 131072 |
968 | +read_only OFF |
969 | +read_rnd_buffer_size 262144 |
970 | +relay_log |
971 | +relay_log_index |
972 | +relay_log_info_file relay-log.info |
973 | +relay_log_purge ON |
974 | +relay_log_space_limit 0 |
975 | +report_host |
976 | +report_password |
977 | +report_port 3306 |
978 | +report_user |
979 | +rpl_recovery_rank 0 |
980 | +secure_auth OFF |
981 | +secure_file_priv |
982 | +server_id 0 |
983 | +skip_external_locking ON |
984 | +skip_name_resolve OFF |
985 | +skip_networking OFF |
986 | +skip_show_database OFF |
987 | +slave_compressed_protocol OFF |
988 | +slave_exec_mode STRICT |
989 | +slave_load_tmpdir /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/tmp |
990 | +slave_max_allowed_packet 1073741824 |
991 | +slave_net_timeout 3600 |
992 | +slave_skip_errors OFF |
993 | +slave_transaction_retries 10 |
994 | +slow_launch_time 2 |
995 | +slow_query_log OFF |
996 | +slow_query_log_file /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/data/mysql_sandbox5166-slow.log |
997 | +slow_query_log_microseconds_timestamp OFF |
998 | +socket /tmp/mysql_sandbox5166.sock |
999 | +sort_buffer_size 2097144 |
1000 | +sql_auto_is_null ON |
1001 | +sql_big_selects ON |
1002 | +sql_big_tables OFF |
1003 | +sql_buffer_result OFF |
1004 | +sql_log_bin ON |
1005 | +sql_log_off OFF |
1006 | +sql_log_update ON |
1007 | +sql_low_priority_updates OFF |
1008 | +sql_max_join_size 18446744073709551615 |
1009 | +sql_mode |
1010 | +sql_notes ON |
1011 | +sql_quote_show_create ON |
1012 | +sql_safe_updates OFF |
1013 | +sql_select_limit 18446744073709551615 |
1014 | +sql_slave_skip_counter |
1015 | +sql_warnings OFF |
1016 | +ssl_ca |
1017 | +ssl_capath |
1018 | +ssl_cert |
1019 | +ssl_cipher |
1020 | +ssl_key |
1021 | +storage_engine MyISAM |
1022 | +suppress_log_warning_1592 OFF |
1023 | +sync_binlog 0 |
1024 | +sync_frm ON |
1025 | +system_time_zone UYST |
1026 | +table_definition_cache 256 |
1027 | +table_lock_wait_timeout 50 |
1028 | +table_open_cache 64 |
1029 | +table_type MyISAM |
1030 | +thread_cache_size 0 |
1031 | +thread_handling one-thread-per-connection |
1032 | +thread_stack 262144 |
1033 | +thread_statistics OFF |
1034 | +time_format %H:%i:%s |
1035 | +time_zone SYSTEM |
1036 | +timed_mutexes OFF |
1037 | +timestamp 1354309666 |
1038 | +tmp_table_size 16777216 |
1039 | +tmpdir /home/martin/sandboxes/Percona-Server-5.1.66-rel14.1/tmp |
1040 | +transaction_alloc_block_size 8192 |
1041 | +transaction_prealloc_size 4096 |
1042 | +tx_isolation REPEATABLE-READ |
1043 | +unique_checks ON |
1044 | +updatable_views_with_limit YES |
1045 | +use_global_log_slow_control none |
1046 | +use_global_long_query_time OFF |
1047 | +userstat_running OFF |
1048 | +version 5.1.66rel14.1 |
1049 | +version_comment Percona Server with XtraDB (GPL), Release rel14.1, Revision 495 |
1050 | +version_compile_machine x86_64 |
1051 | +version_compile_os unknown-linux-gnu |
1052 | +wait_timeout 28800 |
1053 | +warning_count 0 |
1054 | + |
1055 | |
1056 | === added file 't/pt-mysql-summary/samples/percona-server-5.5-variables' |
1057 | --- t/pt-mysql-summary/samples/percona-server-5.5-variables 1970-01-01 00:00:00 +0000 |
1058 | +++ t/pt-mysql-summary/samples/percona-server-5.5-variables 2012-12-04 16:22:36 +0000 |
1059 | @@ -0,0 +1,380 @@ |
1060 | +auto_increment_increment 1 |
1061 | +auto_increment_offset 1 |
1062 | +autocommit ON |
1063 | +automatic_sp_privileges ON |
1064 | +back_log 50 |
1065 | +basedir /home/hugmeir/mysql/Percona-Server-5.5.23-rel25.3-240.Linux.x86_64 |
1066 | +big_tables OFF |
1067 | +binlog_cache_size 32768 |
1068 | +binlog_direct_non_transactional_updates OFF |
1069 | +binlog_format STATEMENT |
1070 | +binlog_stmt_cache_size 32768 |
1071 | +bulk_insert_buffer_size 8388608 |
1072 | +character_set_client latin1 |
1073 | +character_set_connection latin1 |
1074 | +character_set_database latin1 |
1075 | +character_set_filesystem binary |
1076 | +character_set_results latin1 |
1077 | +character_set_server latin1 |
1078 | +character_set_system utf8 |
1079 | +character_sets_dir /home/hugmeir/mysql/Percona-Server-5.5.23-rel25.3-240.Linux.x86_64/share/charsets/ |
1080 | +collation_connection latin1_swedish_ci |
1081 | +collation_database latin1_swedish_ci |
1082 | +collation_server latin1_swedish_ci |
1083 | +completion_type NO_CHAIN |
1084 | +concurrent_insert AUTO |
1085 | +connect_timeout 10 |
1086 | +datadir /tmp/12345/data/ |
1087 | +date_format %Y-%m-%d |
1088 | +datetime_format %Y-%m-%d %H:%i:%s |
1089 | +default_storage_engine InnoDB |
1090 | +default_week_format 0 |
1091 | +delay_key_write ON |
1092 | +delayed_insert_limit 100 |
1093 | +delayed_insert_timeout 300 |
1094 | +delayed_queue_size 1000 |
1095 | +div_precision_increment 4 |
1096 | +engine_condition_pushdown ON |
1097 | +event_scheduler OFF |
1098 | +expand_fast_index_creation OFF |
1099 | +expire_logs_days 0 |
1100 | +fast_index_creation ON |
1101 | +flush OFF |
1102 | +flush_time 0 |
1103 | +foreign_key_checks ON |
1104 | +ft_boolean_syntax + -><()~*:""&| |
1105 | +ft_max_word_len 84 |
1106 | +ft_min_word_len 4 |
1107 | +ft_query_expansion_limit 20 |
1108 | +ft_stopword_file (built-in) |
1109 | +general_log ON |
1110 | +general_log_file genlog |
1111 | +group_concat_max_len 1024 |
1112 | +have_compress YES |
1113 | +have_crypt YES |
1114 | +have_csv YES |
1115 | +have_dynamic_loading YES |
1116 | +have_geometry YES |
1117 | +have_innodb YES |
1118 | +have_ndbcluster NO |
1119 | +have_openssl DISABLED |
1120 | +have_partitioning YES |
1121 | +have_profiling YES |
1122 | +have_query_cache YES |
1123 | +have_response_time_distribution YES |
1124 | +have_rtree_keys YES |
1125 | +have_ssl DISABLED |
1126 | +have_symlink YES |
1127 | +hostname naw |
1128 | +ignore_builtin_innodb OFF |
1129 | +init_connect |
1130 | +init_file |
1131 | +init_slave |
1132 | +innodb_adaptive_flushing ON |
1133 | +innodb_adaptive_flushing_method estimate |
1134 | +innodb_adaptive_hash_index ON |
1135 | +innodb_adaptive_hash_index_partitions 1 |
1136 | +innodb_additional_mem_pool_size 8388608 |
1137 | +innodb_autoextend_increment 8 |
1138 | +innodb_autoinc_lock_mode 1 |
1139 | +innodb_blocking_buffer_pool_restore OFF |
1140 | +innodb_buffer_pool_instances 1 |
1141 | +innodb_buffer_pool_restore_at_startup 0 |
1142 | +innodb_buffer_pool_shm_checksum ON |
1143 | +innodb_buffer_pool_shm_key 0 |
1144 | +innodb_buffer_pool_size 33554432 |
1145 | +innodb_change_buffering all |
1146 | +innodb_checkpoint_age_target 0 |
1147 | +innodb_checksums ON |
1148 | +innodb_commit_concurrency 0 |
1149 | +innodb_concurrency_tickets 500 |
1150 | +innodb_corrupt_table_action assert |
1151 | +innodb_data_file_path ibdata1:10M:autoextend |
1152 | +innodb_data_home_dir /tmp/12345/data |
1153 | +innodb_dict_size_limit 0 |
1154 | +innodb_doublewrite ON |
1155 | +innodb_doublewrite_file |
1156 | +innodb_fake_changes OFF |
1157 | +innodb_fast_checksum OFF |
1158 | +innodb_fast_shutdown 1 |
1159 | +innodb_file_format Antelope |
1160 | +innodb_file_format_check ON |
1161 | +innodb_file_format_max Antelope |
1162 | +innodb_file_per_table OFF |
1163 | +innodb_flush_log_at_trx_commit 1 |
1164 | +innodb_flush_method |
1165 | +innodb_flush_neighbor_pages area |
1166 | +innodb_force_load_corrupted OFF |
1167 | +innodb_force_recovery 0 |
1168 | +innodb_ibuf_accel_rate 100 |
1169 | +innodb_ibuf_active_contract 1 |
1170 | +innodb_ibuf_max_size 16760832 |
1171 | +innodb_import_table_from_xtrabackup 0 |
1172 | +innodb_io_capacity 200 |
1173 | +innodb_kill_idle_transaction 0 |
1174 | +innodb_large_prefix OFF |
1175 | +innodb_lazy_drop_table 0 |
1176 | +innodb_lock_wait_timeout 3 |
1177 | +innodb_locks_unsafe_for_binlog OFF |
1178 | +innodb_log_block_size 512 |
1179 | +innodb_log_buffer_size 8388608 |
1180 | +innodb_log_file_size 5242880 |
1181 | +innodb_log_files_in_group 2 |
1182 | +innodb_log_group_home_dir /tmp/12345/data |
1183 | +innodb_max_dirty_pages_pct 75 |
1184 | +innodb_max_purge_lag 0 |
1185 | +innodb_mirrored_log_groups 1 |
1186 | +innodb_old_blocks_pct 37 |
1187 | +innodb_old_blocks_time 0 |
1188 | +innodb_open_files 300 |
1189 | +innodb_page_size 16384 |
1190 | +innodb_purge_batch_size 20 |
1191 | +innodb_purge_threads 1 |
1192 | +innodb_random_read_ahead OFF |
1193 | +innodb_read_ahead linear |
1194 | +innodb_read_ahead_threshold 56 |
1195 | +innodb_read_io_threads 4 |
1196 | +innodb_recovery_stats OFF |
1197 | +innodb_recovery_update_relay_log OFF |
1198 | +innodb_replication_delay 0 |
1199 | +innodb_rollback_on_timeout OFF |
1200 | +innodb_rollback_segments 128 |
1201 | +innodb_show_locks_held 10 |
1202 | +innodb_show_verbose_locks 0 |
1203 | +innodb_spin_wait_delay 6 |
1204 | +innodb_stats_auto_update 1 |
1205 | +innodb_stats_method nulls_equal |
1206 | +innodb_stats_on_metadata ON |
1207 | +innodb_stats_sample_pages 8 |
1208 | +innodb_stats_update_need_lock 1 |
1209 | +innodb_strict_mode OFF |
1210 | +innodb_support_xa ON |
1211 | +innodb_sync_spin_loops 30 |
1212 | +innodb_table_locks ON |
1213 | +innodb_thread_concurrency 0 |
1214 | +innodb_thread_concurrency_timer_based OFF |
1215 | +innodb_thread_sleep_delay 10000 |
1216 | +innodb_use_global_flush_log_at_trx_commit ON |
1217 | +innodb_use_native_aio ON |
1218 | +innodb_use_sys_malloc ON |
1219 | +innodb_use_sys_stats_table OFF |
1220 | +innodb_version 1.1.8-rel25.3 |
1221 | +innodb_write_io_threads 4 |
1222 | +interactive_timeout 28800 |
1223 | +join_buffer_size 131072 |
1224 | +keep_files_on_create OFF |
1225 | +key_buffer_size 16777216 |
1226 | +key_cache_age_threshold 300 |
1227 | +key_cache_block_size 1024 |
1228 | +key_cache_division_limit 100 |
1229 | +large_files_support ON |
1230 | +large_page_size 0 |
1231 | +large_pages OFF |
1232 | +lc_messages en_US |
1233 | +lc_messages_dir /home/hugmeir/mysql/Percona-Server-5.5.23-rel25.3-240.Linux.x86_64/share/ |
1234 | +lc_time_names en_US |
1235 | +license GPL |
1236 | +local_infile ON |
1237 | +lock_wait_timeout 31536000 |
1238 | +locked_in_memory OFF |
1239 | +log ON |
1240 | +log_bin ON |
1241 | +log_bin_trust_function_creators OFF |
1242 | +log_error /tmp/12345/data/mysqld.log |
1243 | +log_output FILE |
1244 | +log_queries_not_using_indexes OFF |
1245 | +log_slave_updates ON |
1246 | +log_slow_admin_statements OFF |
1247 | +log_slow_filter |
1248 | +log_slow_queries OFF |
1249 | +log_slow_rate_limit 1 |
1250 | +log_slow_rate_type session |
1251 | +log_slow_slave_statements OFF |
1252 | +log_slow_sp_statements ON |
1253 | +log_slow_verbosity |
1254 | +log_warnings 1 |
1255 | +log_warnings_suppress |
1256 | +long_query_time 10.000000 |
1257 | +low_priority_updates OFF |
1258 | +lower_case_file_system OFF |
1259 | +lower_case_table_names 0 |
1260 | +max_allowed_packet 1048576 |
1261 | +max_binlog_cache_size 18446744073709547520 |
1262 | +max_binlog_size 1073741824 |
1263 | +max_binlog_stmt_cache_size 18446744073709547520 |
1264 | +max_connect_errors 10 |
1265 | +max_connections 151 |
1266 | +max_delayed_threads 20 |
1267 | +max_error_count 64 |
1268 | +max_heap_table_size 16777216 |
1269 | +max_insert_delayed_threads 20 |
1270 | +max_join_size 18446744073709551615 |
1271 | +max_length_for_sort_data 1024 |
1272 | +max_long_data_size 1048576 |
1273 | +max_prepared_stmt_count 16382 |
1274 | +max_relay_log_size 0 |
1275 | +max_seeks_for_key 18446744073709551615 |
1276 | +max_sort_length 1024 |
1277 | +max_sp_recursion_depth 0 |
1278 | +max_tmp_tables 32 |
1279 | +max_user_connections 0 |
1280 | +max_write_lock_count 18446744073709551615 |
1281 | +metadata_locks_cache_size 1024 |
1282 | +min_examined_row_limit 0 |
1283 | +multi_range_count 256 |
1284 | +myisam_data_pointer_size 6 |
1285 | +myisam_max_sort_file_size 9223372036853727232 |
1286 | +myisam_mmap_size 18446744073709551615 |
1287 | +myisam_recover_options OFF |
1288 | +myisam_repair_threads 1 |
1289 | +myisam_sort_buffer_size 8388608 |
1290 | +myisam_stats_method nulls_unequal |
1291 | +myisam_use_mmap OFF |
1292 | +net_buffer_length 16384 |
1293 | +net_read_timeout 30 |
1294 | +net_retry_count 10 |
1295 | +net_write_timeout 60 |
1296 | +new OFF |
1297 | +old OFF |
1298 | +old_alter_table OFF |
1299 | +old_passwords OFF |
1300 | +open_files_limit 1024 |
1301 | +optimizer_fix ON |
1302 | +optimizer_prune_level 1 |
1303 | +optimizer_search_depth 62 |
1304 | +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on |
1305 | +performance_schema OFF |
1306 | +performance_schema_events_waits_history_long_size 10000 |
1307 | +performance_schema_events_waits_history_size 10 |
1308 | +performance_schema_max_cond_classes 80 |
1309 | +performance_schema_max_cond_instances 1000 |
1310 | +performance_schema_max_file_classes 50 |
1311 | +performance_schema_max_file_handles 32768 |
1312 | +performance_schema_max_file_instances 10000 |
1313 | +performance_schema_max_mutex_classes 200 |
1314 | +performance_schema_max_mutex_instances 1000000 |
1315 | +performance_schema_max_rwlock_classes 30 |
1316 | +performance_schema_max_rwlock_instances 1000000 |
1317 | +performance_schema_max_table_handles 100000 |
1318 | +performance_schema_max_table_instances 50000 |
1319 | +performance_schema_max_thread_classes 50 |
1320 | +performance_schema_max_thread_instances 1000 |
1321 | +pid_file /tmp/12345/data/mysql_sandbox12345.pid |
1322 | +plugin_dir /home/hugmeir/mysql/Percona-Server-5.5.23-rel25.3-240.Linux.x86_64/lib/plugin/ |
1323 | +port 12345 |
1324 | +preload_buffer_size 32768 |
1325 | +profiling OFF |
1326 | +profiling_history_size 15 |
1327 | +protocol_version 10 |
1328 | +query_alloc_block_size 8192 |
1329 | +query_cache_limit 1048576 |
1330 | +query_cache_min_res_unit 4096 |
1331 | +query_cache_size 0 |
1332 | +query_cache_strip_comments OFF |
1333 | +query_cache_type ON |
1334 | +query_cache_wlock_invalidate OFF |
1335 | +query_prealloc_size 8192 |
1336 | +query_response_time_range_base 10 |
1337 | +query_response_time_stats OFF |
1338 | +range_alloc_block_size 4096 |
1339 | +read_buffer_size 131072 |
1340 | +read_only OFF |
1341 | +read_rnd_buffer_size 262144 |
1342 | +relay_log mysql-relay-bin |
1343 | +relay_log_index |
1344 | +relay_log_info_file relay-log.info |
1345 | +relay_log_purge ON |
1346 | +relay_log_recovery OFF |
1347 | +relay_log_space_limit 0 |
1348 | +report_host 127.0.0.1 |
1349 | +report_password |
1350 | +report_port 12345 |
1351 | +report_user |
1352 | +rpl_recovery_rank 0 |
1353 | +secure_auth OFF |
1354 | +secure_file_priv |
1355 | +server_id 12345 |
1356 | +skip_external_locking ON |
1357 | +skip_name_resolve OFF |
1358 | +skip_networking OFF |
1359 | +skip_show_database OFF |
1360 | +slave_compressed_protocol OFF |
1361 | +slave_exec_mode STRICT |
1362 | +slave_load_tmpdir /tmp |
1363 | +slave_net_timeout 3600 |
1364 | +slave_skip_errors OFF |
1365 | +slave_transaction_retries 10 |
1366 | +slave_type_conversions |
1367 | +slow_launch_time 2 |
1368 | +slow_query_log OFF |
1369 | +slow_query_log_file /tmp/12345/data/naw-slow.log |
1370 | +slow_query_log_timestamp_always OFF |
1371 | +slow_query_log_timestamp_precision second |
1372 | +slow_query_log_use_global_control |
1373 | +socket /tmp/12345/mysql_sandbox12345.sock |
1374 | +sort_buffer_size 2097152 |
1375 | +sql_auto_is_null OFF |
1376 | +sql_big_selects ON |
1377 | +sql_big_tables OFF |
1378 | +sql_buffer_result OFF |
1379 | +sql_log_bin ON |
1380 | +sql_log_off OFF |
1381 | +sql_low_priority_updates OFF |
1382 | +sql_max_join_size 18446744073709551615 |
1383 | +sql_mode |
1384 | +sql_notes ON |
1385 | +sql_quote_show_create ON |
1386 | +sql_safe_updates OFF |
1387 | +sql_select_limit 18446744073709551615 |
1388 | +sql_slave_skip_counter 0 |
1389 | +sql_warnings OFF |
1390 | +ssl_ca |
1391 | +ssl_capath |
1392 | +ssl_cert |
1393 | +ssl_cipher |
1394 | +ssl_key |
1395 | +storage_engine InnoDB |
1396 | +stored_program_cache 256 |
1397 | +sync_binlog 0 |
1398 | +sync_frm ON |
1399 | +sync_master_info 0 |
1400 | +sync_relay_log 0 |
1401 | +sync_relay_log_info 0 |
1402 | +system_time_zone ART |
1403 | +table_definition_cache 400 |
1404 | +table_open_cache 400 |
1405 | +thread_cache_size 0 |
1406 | +thread_concurrency 10 |
1407 | +thread_handling one-thread-per-connection |
1408 | +thread_stack 262144 |
1409 | +thread_statistics OFF |
1410 | +time_format %H:%i:%s |
1411 | +time_zone SYSTEM |
1412 | +timed_mutexes OFF |
1413 | +tmp_table_size 16777216 |
1414 | +tmpdir /tmp |
1415 | +transaction_alloc_block_size 8192 |
1416 | +transaction_prealloc_size 4096 |
1417 | +tx_isolation REPEATABLE-READ |
1418 | +unique_checks ON |
1419 | +updatable_views_with_limit YES |
1420 | +userstat OFF |
1421 | +version 5.5.23-rel25.3-log |
1422 | +version_comment Percona Server with XtraDB (GPL), Release rel25.3, Revision 240 |
1423 | +version_compile_machine x86_64 |
1424 | +version_compile_os Linux |
1425 | +wait_timeout 28800 |
1426 | +internal::nice_of_19928 0 |
1427 | +internal::oom_of_19928 0 |
1428 | +internal::nice_of_19856 0 |
1429 | +internal::oom_of_19856 0 |
1430 | +internal::nice_of_19787 0 |
1431 | +internal::oom_of_19787 0 |
1432 | +pt-summary-internal-pid_file_exists 1 |
1433 | +pt-summary-internal-current_time 2012-11-01 23:13 |
1434 | +pt-summary-internal-Config_File_path |
1435 | +pt-summary-internal-mysql_executable /usr/bin/mysql |
1436 | +pt-summary-internal-now 2012-11-02 00:12:09 |
1437 | +pt-summary-internal-user msandbox@% |
1438 | +pt-summary-internal-FNV_64 Unknown |
1439 | +pt-summary-internal-trigger_count 6 |
I think there's a more elegant way to handle renamed vars which might make our lives easier in the future since renamed vars is pretty common (i.e. it's not a new phenomenon in PS 5.5). Right now we're doing:
149 + # Renamed to innodb_ corrupt_ table_action in 5.5.10-20.1 res="$( feat_on "$file" innodb_ pass_corrupt_ table)" res:-"" }" = "Not Supported" ]; then res="$( feat_on "$file" innodb_ corrupt_ table_action) "
150 + local corrupt_
151 + if [ "${corrupt_
152 + corrupt_
153 + fi
154 + name_val "Corruption Resilient" "$corrupt_res"
I think feat_on() should just take multiple var names, so:
local corrupt_ res="$( feat_on "$file" innodb_ pass_corrupt_ table innodb_ corrupt_ table_action) "