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

Merge pull request #276 from git001/patch-1

Browse source 
Fix Argument "NULL" isn't numeric
This commit is contained in:
Jean-Marie Renouard 2016-11-29 09:14:33 +01:00 committed by GitHub
commit 57b30a2955
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysqltuner.pl
View file

@ -319,6 +319,9 @@ sub hr_bytes {
# Calculates the parameter passed in bytes, then rounds it to the nearest integer # Calculates the parameter passed in bytes, then rounds it to the nearest integer
sub hr_bytes_rnd { sub hr_bytes_rnd {
my $num = shift; my $num = shift;
return "0B" if $num eq "NULL" ;
if ( $num >= ( 1024**3 ) ) { #GB if ( $num >= ( 1024**3 ) ) { #GB
return int( ( $num / ( 1024**3 ) ) ) . "G"; return int( ( $num / ( 1024**3 ) ) ) . "G";
} }
@ -355,6 +358,7 @@ sub percentage {
my $value = shift; my $value = shift;
my $total = shift; my $total = shift;
$total = 0 unless defined $total; $total = 0 unless defined $total;
$total = 0 if $total eq "NULL";
return 100, 00 if $total == 0; return 100, 00 if $total == 0;
return sprintf( "%.2f", ( $value * 100 / $total ) ); return sprintf( "%.2f", ( $value * 100 / $total ) );
} }
@ -5450,7 +5454,7 @@ sub mysql_databases {
) )
) . ")"; ) . ")";
badprint "Index size is larger than data size for $dbinfo[0] \n" badprint "Index size is larger than data size for $dbinfo[0] \n"
if $dbinfo[2] < $dbinfo[3]; if ( $dbinfo[2] ne 'NULL' ) and ( $dbinfo[3] ne 'NULL' ) and ( $dbinfo[2] < $dbinfo[3] );
badprint "There are " . $dbinfo[5] . " storage engines. Be careful. \n" badprint "There are " . $dbinfo[5] . " storage engines. Be careful. \n"
if $dbinfo[5] > 1; if $dbinfo[5] > 1;
$result{'Databases'}{ $dbinfo[0] }{'Rows'} = $dbinfo[1]; $result{'Databases'}{ $dbinfo[0] }{'Rows'} = $dbinfo[1];