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

Merge pull request #630 from longradix/master

Browse source 
Update mysqltuner.pl
This commit is contained in:
Jean-Marie Renouard 2023-03-09 23:12:58 +01:00 committed by GitHub
commit 76709da875
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mysqltuner.pl
View file

@ -797,9 +797,9 @@ sub mysql_setup {
} }
} }
# Did we already get a username without password on the command line? # Did we already get a username with or without password on the command line?
if ( $opt{user} ne 0 and $opt{pass} eq 0 ) { if ( $opt{user} ne 0 ) {
$mysqllogin = "-u $opt{user} " . $remotestring; $mysqllogin = "-u $opt{user} " . (($opt{pass} ne 0) ? "-p'$opt{pass}' " : " ") . $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/ ) {
goodprint "Logged in using credentials passed on the command line"; goodprint "Logged in using credentials passed on the command line";
@ -812,20 +812,6 @@ sub mysql_setup {
} }
} }
# Did we already get a username and password passed on the command line?
if ( $opt{user} ne 0 and $opt{pass} ne 0 ) {
$mysqllogin = "-u $opt{user} -p'$opt{pass}'" . $remotestring;
my $loginstatus = `$mysqladmincmd ping $mysqllogin 2>&1`;
if ( $loginstatus =~ /mysqld is alive/ ) {
goodprint "Logged in using credentials passed on the command line";
return 1;
}
else {
badprint
"Attempted to use login credentials, but they were invalid";
exit 1;
}
}
my $svcprop = which( "svcprop", $ENV{'PATH'} ); my $svcprop = which( "svcprop", $ENV{'PATH'} );
if ( substr( $svcprop, 0, 1 ) =~ "/" ) { if ( substr( $svcprop, 0, 1 ) =~ "/" ) {