Merge lp:~percona-toolkit-dev/percona-toolkit/pt-mysql-summary-fails-to-parse-wsrep_provider_options-1264580 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.11

[Frank Cizmich]

Changed awk for perl in the pretty_print_cnf_file() function. This allowed better regexp handling.

Added test case for this.

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2014-08-05 20:37:42 +0000
+++ bin/pt-mysql-summary	2014-09-08 21:46:20 +0000
@@ -1353,26 +1353,19 @@
 
    [ -e "$file" ] || return
 
-   awk '
-   BEGIN {
-      FS="="
-   }
-   /^[ \t]*[a-zA-Z[]/ {
-      if (length($2)) {
-         gsub(/^[ \t]*/, "", $1);
-         gsub(/^[ \t]*/, "", $2);
-         gsub(/[ \t]*$/, "", $1);
-         gsub(/[ \t]*$/, "", $2);
-         printf("%-35s = %s\n", $1, $2);
-      }
-      else if ( $0 ~ /\[/ ) {
-         print "";
-         print $1;
-      }
-      else {
-         print $1;
-      }
-   }' "$file"
+   perl -n -l -e '
+      my $line = $_;
+      if ( $line =~ /^[ \t]*[a-zA-Z[]/ ) { 
+         if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) { 
+            printf("%-35s = %s\n", $1, $2)  
+         } 
+         elsif ( $line =~ /\s*\[/ ) { 
+            print "\n$line" 
+         } else {
+            print $line
+         } 
+      }' "$file"
+
 }
 
 find_checkpoint_age() {

=== modified file 'lib/bash/report_mysql_info.sh'
--- lib/bash/report_mysql_info.sh	2013-12-12 05:49:59 +0000
+++ lib/bash/report_mysql_info.sh	2014-09-08 21:46:20 +0000
@@ -345,37 +345,28 @@
    echo
 }
 
-# Pretty-prints the my.cnf file.  It's super annoying, but some *modern*
-# versions of awk don't support POSIX character sets in regular
-# expressions, like [[:space:]] (looking at you, Debian).  So
-# the below patterns contain [<space><tab>] and must remain that way.
+# Pretty-prints the my.cnf file.
 pretty_print_cnf_file () {
    local file="$1"
 
    [ -e "$file" ] || return
 
-   awk '
-   BEGIN {
-      FS="="
-   }
-   /^[ \t]*[a-zA-Z[]/ {
-      if (length($2)) {
-         gsub(/^[ \t]*/, "", $1);
-         gsub(/^[ \t]*/, "", $2);
-         gsub(/[ \t]*$/, "", $1);
-         gsub(/[ \t]*$/, "", $2);
-         printf("%-35s = %s\n", $1, $2);
-      }
-      else if ( $0 ~ /\[/ ) {
-         print "";
-         print $1;
-      }
-      else {
-         print $1;
-      }
-   }' "$file"
+   perl -n -l -e '
+      my $line = $_;
+      if ( $line =~ /^\s*[a-zA-Z[]/ ) { 
+         if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) { 
+            printf("%-35s = %s\n", $1, $2)  
+         } 
+         elsif ( $line =~ /\s*\[/ ) { 
+            print "\n$line" 
+         } else {
+            print $line
+         } 
+      }' "$file"
+
 }
 
+
 find_checkpoint_age() {
    local file="$1"
    awk '

=== modified file 'sandbox/start-sandbox'
--- sandbox/start-sandbox	2014-04-30 14:53:04 +0000
+++ sandbox/start-sandbox	2014-09-08 21:46:20 +0000
@@ -240,7 +240,7 @@
 
 if [ $type = "cluster" -o $APP = "pxc" ]; then
    ip=$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public')
-   version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V --bind-address $ip 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
+   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`;
 else
    version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
 fi

=== modified file 't/lib/bash/report_mysql_info.sh'
--- t/lib/bash/report_mysql_info.sh	2013-12-12 05:49:59 +0000
+++ t/lib/bash/report_mysql_info.sh	2014-09-08 21:46:20 +0000
@@ -172,6 +172,7 @@
 ssl                                 = 1
 server-id                           = 1
 log-bin                             = sl1-bin
+wsrep_provider_options              = "gcache.size=64M;base_host=10.1.2.102; base_port=4567; cert.log_conflicts=no;etc=etc;"
 
 [mysql.server]
 user                                = mysql

=== modified file 't/pt-mysql-summary/samples/my.cnf-001.txt'
--- t/pt-mysql-summary/samples/my.cnf-001.txt	2011-07-01 16:29:50 +0000
+++ t/pt-mysql-summary/samples/my.cnf-001.txt	2014-09-08 21:46:20 +0000
@@ -24,6 +24,8 @@
 server-id = 1
 log-bin=sl1-bin
 
+wsrep_provider_options = "gcache.size=64M;base_host=10.1.2.102; base_port=4567; cert.log_conflicts=no;etc=etc;"
+
 [mysql.server]
 user=mysql
 ####basedir=/var/lib