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

Issue #113: Typo fix

Browse source 
Issue #111: MariaDB 10 and 11 as supported version
Issue #109: Ne line at the end of help display
This commit is contained in:
Jean-Marie RENOUARD 2015-08-24 09:51:03 +02:00
parent a00628d869
commit 7c51a70b36
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mysqltuner.pl
View file

@ -123,7 +123,7 @@ sub usage {
. " --dbstat Print database information\n" . " --dbstat Print database information\n"
. " --idxstat Print index information\n" . " --idxstat Print index information\n"
. " --nocolor Don't print output in color\n" . " --nocolor Don't print output in color\n"
. " --buffers Print global and per-thread buffer values"; . " --buffers Print global and per-thread buffer values\n";
exit; exit;
} }
@ -857,11 +857,10 @@ sub validate_mysql_version {
. $myvar{'version'} . $myvar{'version'}
. " is EOL software! Upgrade soon!"; . " is EOL software! Upgrade soon!";
} }
elsif ( mysql_version_ge(6) ) { elsif ( ( mysql_version_ge(6) and mysql_version_le(9) ) or mysql_version_ge(12) ) {
badprint "Currently running unsupported MySQL version " badprint "Currently running unsupported MySQL version "
. $myvar{'version'} . ""; . $myvar{'version'} . "";
} } else {
else {
goodprint "Currently running supported MySQL version " goodprint "Currently running supported MySQL version "
. $myvar{'version'} . ""; . $myvar{'version'} . "";
} }
@ -878,6 +877,17 @@ sub mysql_version_ge {
|| $mysqlverminor == $min && $mysqlvermicro >= $mic ); || $mysqlverminor == $min && $mysqlvermicro >= $mic );
} }
# Checks if MySQL version is lower than equal to (major, minor, micro)
sub mysql_version_le {
my ( $maj, $min, $mic ) = @_;
$min ||= 0;
$mic ||= 0;
return $mysqlvermajor < $maj
|| $mysqlvermajor == $maj
&& ( $mysqlverminor < $min
|| $mysqlverminor == $min && $mysqlvermicro <= $mic );
}
# Checks for 32-bit boxes with more than 2GB of RAM # Checks for 32-bit boxes with more than 2GB of RAM
my ($arch); my ($arch);
@ -1920,7 +1930,7 @@ sub mysql_stats {
. $myvar{'open_files_limit'} . $myvar{'open_files_limit'}
. ") variable " ); . ") variable " );
push( @generalrec, push( @generalrec,
"should be greater that $table_cache_var ( " "should be greater than $table_cache_var ( "
. $myvar{$table_cache_var} . $myvar{$table_cache_var}
. ")" ); . ")" );
} }