Skip to content

Commit 5c307d1

Browse files
committed
correct messages on no InnoDB
enginestats are only populated if tables exist of that type. Look at default_storage_engine if defined to communicate the default storage engine. closes #469
1 parent 950df57 commit 5c307d1

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

mysqltuner.pl

+14-7
Original file line numberDiff line numberDiff line change
@@ -5557,21 +5557,28 @@ sub mysql_innodb {
55575557

55585558
# InnoDB
55595559
unless ( defined $myvar{'have_innodb'}
5560-
&& $myvar{'have_innodb'} eq "YES"
5561-
&& defined $enginestats{'InnoDB'} )
5560+
&& $myvar{'have_innodb'} eq "YES")
55625561
{
5563-
if ( $opt{skipsize} eq 1 ) {
5564-
infoprint "Skipped due to --skipsize option";
5565-
return;
5566-
}
55675562
infoprint "InnoDB is disabled.";
55685563
if ( mysql_version_ge( 5, 5 ) ) {
5564+
my $defengine = 'InnoDB';
5565+
$defengine = $myvar{'default_storage_engine'} if defined($myvar{'default_storage_engine'});
55695566
badprint
5570-
"InnoDB Storage engine is disabled. InnoDB is the default storage engine";
5567+
"InnoDB Storage engine is disabled. $defengine is the default storage engine" if $defengine eq 'InnoDB';
5568+
infoprint
5569+
"InnoDB Storage engine is disabled. $defengine is the default storage engine" if $defengine ne 'InnoDB';
55715570
}
55725571
return;
55735572
}
55745573
infoprint "InnoDB is enabled.";
5574+
if (! defined $enginestats{'InnoDB'} ) {
5575+
if ( $opt{skipsize} eq 1 ) {
5576+
infoprint "Skipped due to --skipsize option";
5577+
return;
5578+
}
5579+
badprint "No tables are Innodb";
5580+
$enginestats{'InnoDB'} = 0;
5581+
}
55755582

55765583
if ( $opt{buffers} ne 0 ) {
55775584
infoprint "InnoDB Buffers";

0 commit comments

Comments
 (0)