hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix #453

Browse source
This commit is contained in:
Jean-Marie Renouard 2019-09-25 23:29:22 +02:00
parent fb421bccd1
commit ebc6619e4f
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
mysqltuner.pl
View file

@ -1,5 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# mysqltuner.pl - Version 1.7.15 # mysqltuner.pl - Version 1.7.16
# High Performance MySQL Tuning Script # High Performance MySQL Tuning Script
# Copyright (C) 2006-2018 Major Hayden - major@mhtx.net # Copyright (C) 2006-2018 Major Hayden - major@mhtx.net
# #
@ -56,7 +56,7 @@ $Data::Dumper::Pair = " : ";
#use Env; #use Env;
# Set up a few variables for use in the script # Set up a few variables for use in the script
my $tunerversion = "1.7.15"; my $tunerversion = "1.7.16";
my ( @adjvars, @generalrec ); my ( @adjvars, @generalrec );
# Set defaults # Set defaults
@ -1963,26 +1963,27 @@ sub validate_mysql_version {
$myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/; $myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
$mysqlverminor ||= 0; $mysqlverminor ||= 0;
$mysqlvermicro ||= 0; $mysqlvermicro ||= 0;
if ( !mysql_version_ge( 5, 1 ) ) {
if ( mysql_version_eq(8) or mysql_version_eq(5, 6) or mysql_version_eq(5, 7)
or mysql_version_eq(10, 1) or mysql_version_eq(10, 2) or mysql_version_eq(10, 3)
or mysql_version_eq(10, 4) )
{
goodprint "Currently running supported MySQL version " . $myvar{'version'} . "";
return;
}
if ( mysql_version_ge( 5 ) or mysql_version_ge( 4 ) or mysql_version_eq(10, 0) ) {
badprint "Your MySQL version " badprint "Your MySQL version "
. $myvar{'version'} . $myvar{'version'}
. " is EOL software! Upgrade soon!"; . " is EOL software! Upgrade soon!";
} }
elsif ( ( mysql_version_ge(6) and mysql_version_le(9) )
or mysql_version_ge(12) )
{
badprint "Currently running unsupported MySQL version "
. $myvar{'version'} . "";
}
else {
goodprint "Currently running supported MySQL version "
. $myvar{'version'} . "";
}
} }
# Checks if MySQL version is equal to (major, minor, micro) # Checks if MySQL version is equal to (major, minor, micro)
sub mysql_version_eq { sub mysql_version_eq {
my ( $maj, $min, $mic ) = @_; my ( $maj, $min, $mic ) = @_;
my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro ) =
$myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
return int($mysqlvermajor) == int($maj) return int($mysqlvermajor) == int($maj)
if ( !defined($min) && !defined($mic) ); if ( !defined($min) && !defined($mic) );
return int($mysqlvermajor) == int($maj) && int($mysqlverminor) == int($min) return int($mysqlvermajor) == int($maj) && int($mysqlverminor) == int($min)
@ -1997,6 +1998,9 @@ sub mysql_version_ge {
my ( $maj, $min, $mic ) = @_; my ( $maj, $min, $mic ) = @_;
$min ||= 0; $min ||= 0;
$mic ||= 0; $mic ||= 0;
my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro ) =
$myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
return return
int($mysqlvermajor) > int($maj) int($mysqlvermajor) > int($maj)
|| ( int($mysqlvermajor) == int($maj) && int($mysqlverminor) > int($min) ) || ( int($mysqlvermajor) == int($maj) && int($mysqlverminor) > int($min) )
@ -2010,6 +2014,8 @@ sub mysql_version_le {
my ( $maj, $min, $mic ) = @_; my ( $maj, $min, $mic ) = @_;
$min ||= 0; $min ||= 0;
$mic ||= 0; $mic ||= 0;
my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro ) =
$myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
return return
int($mysqlvermajor) < int($maj) int($mysqlvermajor) < int($maj)
|| ( int($mysqlvermajor) == int($maj) && int($mysqlverminor) < int($min) ) || ( int($mysqlvermajor) == int($maj) && int($mysqlverminor) < int($min) )
@ -2021,6 +2027,9 @@ sub mysql_version_le {
# Checks if MySQL micro version is lower than equal to (major, minor, micro) # Checks if MySQL micro version is lower than equal to (major, minor, micro)
sub mysql_micro_version_le { sub mysql_micro_version_le {
my ( $maj, $min, $mic ) = @_; my ( $maj, $min, $mic ) = @_;
my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro ) =
$myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
return $mysqlvermajor == $maj return $mysqlvermajor == $maj
&& ( $mysqlverminor == $min && ( $mysqlverminor == $min
&& $mysqlvermicro <= $mic ); && $mysqlvermicro <= $mic );
@ -3278,7 +3287,10 @@ sub mysql_stats {
# Recommendations for MyISAM # Recommendations for MyISAM
sub mysql_myisam { sub mysql_myisam {
subheaderprint "MyISAM Metrics"; subheaderprint "MyISAM Metrics";
if (mysql_version_ge(8) and mysql_version_le(10) ) {
infoprint "MyISAM Metrics are disabled on last MySQL versions.";
return;
}
# Key buffer usage # Key buffer usage
if ( defined( $mycalc{'pct_key_buffer_used'} ) ) { if ( defined( $mycalc{'pct_key_buffer_used'} ) ) {
if ( $mycalc{'pct_key_buffer_used'} < 90 ) { if ( $mycalc{'pct_key_buffer_used'} < 90 ) {
@ -6348,7 +6360,7 @@ __END__
=head1 NAME =head1 NAME
MySQLTuner 1.7.15 - MySQL High Performance Tuning Script MySQLTuner 1.7.16 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES =head1 IMPORTANT USAGE GUIDELINES