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

#627 swap is off

Browse source 
Get an error when calling hr_bytes

Review licence informations
This commit is contained in:
Jean-Marie Renouard 2023-02-10 07:22:14 +01:00
parent e014012217
commit fe573ac578
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mysqltuner.pl
View file

@ -1,8 +1,8 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# mysqltuner.pl - Version 2.0.11 # mysqltuner.pl - Version 2.0.12
# High Performance MySQL Tuning Script # High Performance MySQL Tuning Script
# Copyright (C) 2006-2022 Major Hayden - major@mhtx.net # Copyright (C) 2006-2023 Major Hayden - major@mhtx.net
# Copyright (C) 2015-2022 Jean-Marie Renouard - jmrenouard@gmail.com # Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
# For the latest updates, please visit http://mysqltuner.pl/ # For the latest updates, please visit http://mysqltuner.pl/
# Git repository available at https://github.com/major/MySQLTuner-perl # Git repository available at https://github.com/major/MySQLTuner-perl
@ -57,7 +57,7 @@ use Cwd 'abs_path';
#use Env; #use Env;
# Set up a few variables for use in the script # Set up a few variables for use in the script
my $tunerversion = "2.0.11"; my $tunerversion = "2.0.12";
my ( @adjvars, @generalrec ); my ( @adjvars, @generalrec );
# Set defaults # Set defaults
@ -325,6 +325,7 @@ sub hr_bytes {
my $num = shift; my $num = shift;
return "0B" unless defined($num); return "0B" unless defined($num);
return "0B" if $num eq "NULL"; return "0B" if $num eq "NULL";
return "0B" if $num eq "";
if ( $num >= ( 1024**3 ) ) { # GB if ( $num >= ( 1024**3 ) ) { # GB
return sprintf( "%.1f", ( $num / ( 1024**3 ) ) ) . "G"; return sprintf( "%.1f", ( $num / ( 1024**3 ) ) ) . "G";
@ -987,14 +988,14 @@ sub mysql_setup {
chomp($password); chomp($password);
chomp($name); chomp($name);
$mysqllogin = "-u $name"; $mysqllogin = "-u $name";
<
if ( length($password) > 0 ) { if ( length($password) > 0 ) {
$mysqllogin .= " -p'$password'"; $mysqllogin .= " -p'$password'";
} }
$mysqllogin .= $remotestring; $mysqllogin .= $remotestring;
my $loginstatus = `$mysqladmincmd ping $mysqllogin 2>&1`; my $loginstatus = `$mysqladmincmd ping $mysqllogin 2>&1`;
if ( $loginstatus =~ /mysqld is alive/ ) { if ( $loginstatus =~ /mysqld is alive/ ) {
print STDERR ""; #print STDERR "";
if ( !length($password) ) { if ( !length($password) ) {
# Did this go well because of a .my.cnf file or is there no password set? # Did this go well because of a .my.cnf file or is there no password set?
@ -1009,7 +1010,7 @@ sub mysql_setup {
return 1; return 1;
} }
else { else {
print STDERR ""; #print STDERR "";
badprint badprint
"Attempted to use login credentials, but they were invalid."; "Attempted to use login credentials, but they were invalid.";
exit 1; exit 1;
@ -6931,7 +6932,7 @@ __END__
=head1 NAME =head1 NAME
MySQLTuner 2.0.11 - MySQL High Performance Tuning Script MySQLTuner 2.0.12 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES =head1 IMPORTANT USAGE GUIDELINES
@ -7016,6 +7017,7 @@ L<https://github.com/major/MySQLTuner-perl/blob/master/INTERNALS.md>
=head1 AUTHORS =head1 AUTHORS
Major Hayden - major@mhtx.net Major Hayden - major@mhtx.net
Jean-Marie Renouard - jmrenouard@gmail.com
=head1 CONTRIBUTORS =head1 CONTRIBUTORS
@ -7166,7 +7168,7 @@ Bug reports, feature requests, and downloads at http://mysqltuner.pl/
Bug tracker can be found at https://github.com/major/MySQLTuner-perl/issues Bug tracker can be found at https://github.com/major/MySQLTuner-perl/issues
Maintained by Major Hayden (major\@mhtx.net) - Licensed under GPL Maintained by Jean-Marie Renouard (jmrenouard\@gmail.com) - Licensed under GPL
=head1 SOURCE CODE =head1 SOURCE CODE
@ -7176,7 +7178,8 @@ L<https://github.com/major/MySQLTuner-perl>
=head1 COPYRIGHT AND LICENSE =head1 COPYRIGHT AND LICENSE
Copyright (C) 2006-2022 Major Hayden - major@mhtx.net Copyright (C) 2006-2023 Major Hayden - major@mhtx.net
# Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
For the latest updates, please visit http://mysqltuner.pl/ For the latest updates, please visit http://mysqltuner.pl/