Skip to content

Commit

Permalink
Merge pull request #703 from jmrenouard/master
Browse files Browse the repository at this point in the history
Use of uninitialized value $opt{"myisamstat"} in numeric eq (==) #702
  • Loading branch information
jmrenouard committed Jul 7, 2023
2 parents c5e5c81 + 54fe8c9 commit 3159e13
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions mysqltuner.pl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
# mysqltuner.pl - Version 2.2.6
# mysqltuner.pl - Version 2.2.7
# High Performance MySQL Tuning Script
# Copyright (C) 2006-2023 Major Hayden - [email protected]
# Copyright (C) 2015-2023 Jean-Marie Renouard - [email protected]
Expand Down Expand Up @@ -57,7 +57,7 @@ package main;
#use Env;

# Set up a few variables for use in the script
my $tunerversion = "2.2.6";
my $tunerversion = "2.2.7";
my ( @adjvars, @generalrec );

# Set defaults
Expand Down Expand Up @@ -235,10 +235,9 @@ package main;
if ( $opt{nopfstat} == 1 ); # Don't print performance schema information
$opt{idxstat} = 0 if ( $opt{noidxstat} == 1 ); # Don't print index information
$opt{structstat} = 0
if ( $opt{nostructstat} == 1 ); # Don't print table struct information
$opt{myisamstat} = 0
if ( $opt{nomyisamstat} == 1 ); # Don't print MyISAM table information

if ( not defined($opt{structstat}) or $opt{nostructstat} == 1 ); # Don't print table struct information
$opt{myisamstat} = 1
if ( not defined($opt{myisamstat}) or $opt{nomyisamstat} == 0 ); # Don't print MyISAM table information
# for RPM distributions
$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"
unless ( defined $opt{cvefile} and -f "$opt{cvefile}" );
Expand Down Expand Up @@ -3857,7 +3856,7 @@ sub mysql_stats {

# Recommendations for MyISAM
sub mysql_myisam {
return 0 unless $opt{'myisamstat'} == 1;
return 0 unless ($opt{'myisamstat'} > 0);
subheaderprint "MyISAM Metrics";
my $nb_myisam_tables = select_one(
"SELECT COUNT(*) FROM information_schema.TABLES WHERE ENGINE='MyISAM' and TABLE_SCHEMA NOT IN ('mysql','information_schema','performance_schema')"
Expand Down Expand Up @@ -5807,7 +5806,7 @@ sub get_wsrep_option {

# REcommendations for Tables
sub mysql_table_structures {
return 0 unless $opt{structstat} == 1;
return 0 unless ($opt{structstat} > 0);
subheaderprint "Table structures analysis";

my @primaryKeysNbTables = select_array(
Expand Down Expand Up @@ -7355,7 +7354,7 @@ sub which {
=head1 NAME
MySQLTuner 2.2.6 - MySQL High Performance Tuning Script
MySQLTuner 2.2.7 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES
Expand Down

0 comments on commit 3159e13

Please sign in to comment.