Merge pull request #801 from remc010/master

714 # fix calculation of innodb_log_size_pct

.dockerignore

@@ -1,7 +1,6 @@
 *.md
-*.md
 build/**
 Makefile
 .perltidy
 *.json
-*.png
+*.png

README.md

@@ -76,7 +76,7 @@ Test result are available here:
 * ColummStore
 * Connect
 
-Unmaintenained staff from MySQL or MariaDB:
+Unmaintenained stuff from MySQL or MariaDB:
 --
 
 * MyISAM is too old and no longer active

mysqltuner.pl

@@ -1590,12 +1590,9 @@ sub log_file_recommendations {
     while ( my $logLi = <$fh> ) {
         chomp $logLi;
         $numLi++;
-        debugprint "$numLi: $logLi"
+        debugprint "$numLi: $logLi" if $logLi =~ /\[(warning|error)\]/i;
-          if $logLi =~ /warning|error/i and $logLi !~ /Logging to/;
+        $nbErrLog++  if $logLi =~ /\[error\]/i;
-        $nbErrLog++
+        $nbWarnLog++ if $logLi =~ /\[warning\]/i;
-          if $logLi  =~ /error/i
-          and $logLi !~ /(Logging to|\[Warning\].*ERROR_FOR_DIVISION_BY_ZERO)/;
-        $nbWarnLog++ if $logLi =~ /warning/i;
         push @lastShutdowns, $logLi
           if $logLi =~ /Shutdown complete/ and $logLi !~ /Innodb/i;
         push @lastStarts, $logLi if $logLi =~ /ready for connections/;
@@ -3182,10 +3179,16 @@ sub calculations {
     $myvar{"innodb_buffer_pool_instances"} = 1
       unless defined( $myvar{'innodb_buffer_pool_instances'} );
     if ( $myvar{'have_innodb'} eq "YES" ) {
-        $mycalc{'innodb_log_size_pct'} =
+        if ( defined $myvar{'innodb_redo_log_capacity'} ) {
-          ( $myvar{'innodb_log_file_size'} *
+          $mycalc{'innodb_log_size_pct'} =
-              $myvar{'innodb_log_files_in_group'} * 100 /
+            ( $myvar{'innodb_redo_log_capacity'} /
-              $myvar{'innodb_buffer_pool_size'} );
+                $myvar{'innodb_buffer_pool_size'} ) * 100;
+        } else {
+          $mycalc{'innodb_log_size_pct'} =
+            ( $myvar{'innodb_log_file_size'} *
+                $myvar{'innodb_log_files_in_group'} * 100 /
+                $myvar{'innodb_buffer_pool_size'} );
+        }
     }
     if ( !defined $myvar{'innodb_buffer_pool_size'} ) {
         $mycalc{'innodb_log_size_pct'}    = 0;