Merge lp:~percona-toolkit-dev/percona-toolkit/pt-mysql-summary-Blank-InnoDB-Section-for-5.6-1254233 into lp:percona-toolkit/2.2

[Frank Cizmich]

pt-mysql-summary stopped printing InnoDB section for MySQL 5.6
This was because it checked for the "have_innodb" variable which was removed in 5.6
Solved by also checking for "innodb_version".

[Daniel Nichter (daniel-nichter)]

Does this work because in the branch we have:

if [ "${have_innodb}" = "YES" ] || [ -n "${innodb_version}" ]; then

which is not same as:

if [[ "${have_innodb}" = "YES" || "${innodb_ver}" > "5.6.1" ]]; then

i.e. in branch we only check if innodb_version is set, but in Michael's patch we check if it's > 5.6.1.

[Frank Cizmich (frank-cizmich)]

It works just as well. I just reasoned that we only need verify that
there is *some* version of innodb present, not really important which.

On 05/27/2014 01:18 PM, Daniel Nichter wrote:
> Does this work because in the branch we have:
>
> if [ "${have_innodb}" = "YES" ] || [ -n "${innodb_version}" ]; then
>
> which is not same as:
>
> if [[ "${have_innodb}" = "YES" || "${innodb_ver}" > "5.6.1" ]]; then
>
> i.e. in branch we only check if innodb_version is set, but in Michael's patch we check if it's > 5.6.1.

--
Frank Cizmich, Software Engineer, Percona
Tel: [phone] Ext: 630
Skype: percona.fcizmich
Montevideo, Uruguay (UTC -3)
www.percona.com
www.mysqlperformanceblog.com

[Daniel Nichter (daniel-nichter)]

True.

review: Approve

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2014-02-20 08:10:16 +0000
+++ bin/pt-mysql-summary	2014-05-25 02:42:03 +0000
@@ -2328,9 +2328,9 @@
 
    section "InnoDB"
    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"
-
       if [ -s "$dir/innodb-status" ]; then
          format_innodb_status "$dir/innodb-status"
       fi

=== modified file 't/pt-mysql-summary/pt-mysql-summary.t'
--- t/pt-mysql-summary/pt-mysql-summary.t	2013-12-12 05:49:59 +0000
+++ t/pt-mysql-summary/pt-mysql-summary.t	2014-05-25 02:42:03 +0000
@@ -60,6 +60,13 @@
    "--databases works"
 );
 
+like(
+   $out,
+   qr/# InnoDB #.*Version.*# MyISAM #/s,
+   "InnoDB section present"
+);
+
+
 # --read-samples
 for my $i (2..7) {
    ok(