percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-13 14:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pt-mysql-summary-Blank-InnoDB-Section-for-5.6-1254233.

Browse Source
This commit is contained in:
Daniel Nichter
2014-05-27 11:30:06 -07:00
parent 1832a457c2 93c11e451b
commit d13575b7a8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-mysql-summary
View File

@@ -2328,9 +2328,9 @@ report_mysql_summary () {
section "InnoDB" section "InnoDB"
local have_innodb="$(get_var "have_innodb" "$dir/mysql-variables")" local have_innodb="$(get_var "have_innodb" "$dir/mysql-variables")"
if [ "${have_innodb}" = "YES" ]; then local innodb_version="$(get_var "innodb_version" "$dir/mysql-variables")"
if [ "${have_innodb}" = "YES" ] || [ -n "${innodb_version}" ]; then
section_innodb "$dir/mysql-variables" "$dir/mysql-status" section_innodb "$dir/mysql-variables" "$dir/mysql-status"
if [ -s "$dir/innodb-status" ]; then if [ -s "$dir/innodb-status" ]; then
format_innodb_status "$dir/innodb-status" format_innodb_status "$dir/innodb-status"
fi fi

7
t/pt-mysql-summary/pt-mysql-summary.t
View File

@@ -60,6 +60,13 @@ like(
"--databases works" "--databases works"
); );
like(
$out,
qr/# InnoDB #.*Version.*# MyISAM #/s,
"InnoDB section present"
);
# --read-samples # --read-samples
for my $i (2..7) { for my $i (2..7) {
ok( ok(