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
This commit is contained in:
Daniel Black 2021-02-01 11:31:40 +11:00
parent 950df575cd
commit 5c307d1813

View file

@ -5557,21 +5557,28 @@ sub mysql_innodb {
# InnoDB # InnoDB
unless ( defined $myvar{'have_innodb'} unless ( defined $myvar{'have_innodb'}
&& $myvar{'have_innodb'} eq "YES" && $myvar{'have_innodb'} eq "YES")
&& defined $enginestats{'InnoDB'} )
{ {
if ( $opt{skipsize} eq 1 ) {
infoprint "Skipped due to --skipsize option";
return;
}
infoprint "InnoDB is disabled."; infoprint "InnoDB is disabled.";
if ( mysql_version_ge( 5, 5 ) ) { if ( mysql_version_ge( 5, 5 ) ) {
my $defengine = 'InnoDB';
$defengine = $myvar{'default_storage_engine'} if defined($myvar{'default_storage_engine'});
badprint badprint
"InnoDB Storage engine is disabled. InnoDB is the default storage engine"; "InnoDB Storage engine is disabled. $defengine is the default storage engine" if $defengine eq 'InnoDB';
infoprint
"InnoDB Storage engine is disabled. $defengine is the default storage engine" if $defengine ne 'InnoDB';
} }
return; return;
} }
infoprint "InnoDB is enabled."; infoprint "InnoDB is enabled.";
if (! defined $enginestats{'InnoDB'} ) {
if ( $opt{skipsize} eq 1 ) {
infoprint "Skipped due to --skipsize option";
return;
}
badprint "No tables are Innodb";
$enginestats{'InnoDB'} = 0;
}
if ( $opt{buffers} ne 0 ) { if ( $opt{buffers} ne 0 ) {
infoprint "InnoDB Buffers"; infoprint "InnoDB Buffers";