updated module and tests for issue - 1264580

lib/bash/report_mysql_info.sh

@@ -345,37 +345,28 @@ summarize_processlist () {
    echo
 }
 
-# Pretty-prints the my.cnf file.  It's super annoying, but some *modern*
+# Pretty-prints the my.cnf file.
-# 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_print_cnf_file () {
    local file="$1"
 
    [ -e "$file" ] || return
 
-   awk '
+   perl -n -l -e '
-   BEGIN {
+      my $line = $_;
-      FS="="
+      if ( $line =~ /^\s*[a-zA-Z[]/ ) { 
+         if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) { 
+            printf("%-35s = %s\n", $1, $2)  
          } 
-   /^[ \t]*[a-zA-Z[]/ {
+         elsif ( $line =~ /\s*\[/ ) { 
-      if (length($2)) {
+            print "\n$line" 
-         gsub(/^[ \t]*/, "", $1);
+         } else {
-         gsub(/^[ \t]*/, "", $2);
+            print $line
-         gsub(/[ \t]*$/, "", $1);
-         gsub(/[ \t]*$/, "", $2);
-         printf("%-35s = %s\n", $1, $2);
-      }
-      else if ( $0 ~ /\[/ ) {
-         print "";
-         print $1;
-      }
-      else {
-         print $1;
          } 
       }' "$file"
+
 }
 
+
 find_checkpoint_age() {
    local file="$1"
    awk '

t/lib/bash/report_mysql_info.sh

@@ -172,6 +172,7 @@ innodb_file_per_table               = 1
 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

t/pt-mysql-summary/samples/my.cnf-001.txt

@@ -24,6 +24,8 @@ 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
 ####basedir=/var/lib