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

Merge 85393335ce into d030d9f340

Browse source
This commit is contained in:
MATSUU Takuto 2014-10-25 10:20:21 +00:00
commit fbfab482da
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mysqltuner.pl
View file

@ -466,9 +466,11 @@ sub get_replication_status {
} }
# Checks for supported or EOL'ed MySQL versions # Checks for supported or EOL'ed MySQL versions
my ($mysqlvermajor,$mysqlverminor); my ($mysqlvermajor,$mysqlverminor, $mysqlvermicro);
sub validate_mysql_version { sub validate_mysql_version {
($mysqlvermajor,$mysqlverminor) = $myvar{'version'} =~ /(\d+)\.(\d+)/; ($mysqlvermajor,$mysqlverminor,$mysqlvermicro) = $myvar{'version'} =~ /^(\d+)(?:\.(\d+)|)(?:\.(\d+)|)/;
$mysqlverminor ||= 0;
$mysqlvermicro ||= 0;
if (!mysql_version_ge(5)) { if (!mysql_version_ge(5)) {
badprint "Your MySQL version ".$myvar{'version'}." is EOL software! Upgrade soon!\n"; badprint "Your MySQL version ".$myvar{'version'}." is EOL software! Upgrade soon!\n";
} elsif (mysql_version_ge(6)) { } elsif (mysql_version_ge(6)) {
@ -478,10 +480,12 @@ sub validate_mysql_version {
} }
} }
# Checks if MySQL version is greater than equal to (major, minor) # Checks if MySQL version is greater than equal to (major, minor, micro)
sub mysql_version_ge { sub mysql_version_ge {
my ($maj, $min) = @_; my ($maj, $min, $mic) = @_;
return $mysqlvermajor > $maj || ($mysqlvermajor == $maj && $mysqlverminor >= ($min || 0)); $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
@ -532,7 +536,7 @@ sub check_storage_engines {
print "\n-------- Storage Engine Statistics -------------------------------------------\n"; print "\n-------- Storage Engine Statistics -------------------------------------------\n";
infoprint "Status: "; infoprint "Status: ";
my $engines; my $engines;
if (mysql_version_ge(5)) { if (mysql_version_ge(5, 1, 5)) {
my @engineresults = `mysql $mysqllogin -Bse "SELECT ENGINE,SUPPORT FROM information_schema.ENGINES WHERE ENGINE NOT IN ('performance_schema','MyISAM','MERGE','MEMORY') ORDER BY ENGINE ASC"`; my @engineresults = `mysql $mysqllogin -Bse "SELECT ENGINE,SUPPORT FROM information_schema.ENGINES WHERE ENGINE NOT IN ('performance_schema','MyISAM','MERGE','MEMORY') ORDER BY ENGINE ASC"`;
foreach my $line (@engineresults) { foreach my $line (@engineresults) {
my ($engine,$engineenabled); my ($engine,$engineenabled);