Compare commits

..

No commits in common. "master" and "v2.6.0" have entirely different histories.

3 changed files with 13 additions and 15 deletions

View file

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

View file

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

View file

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