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

Merge pull request #157 from 0xbsec/WindowsPorting

Browse source 
#87 small fixes for windows porting
This commit is contained in:
Jean-Marie Renouard 2016-02-21 17:45:29 +01:00
commit 1812a7a854
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysqltuner.pl
View file

@ -507,7 +507,7 @@ sub mysql_setup {
# Did we already get a username and password passed on the command line? # Did we already get a username and password passed on the command line?
if ( $opt{user} ne 0 and $opt{pass} ne 0 ) { if ( $opt{user} ne 0 and $opt{pass} ne 0 ) {
$mysqllogin = "-u $opt{user} -p'$opt{pass}'" . $remotestring; $mysqllogin = "-u $opt{user} -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 goodprint
@ -649,7 +649,7 @@ sub mysql_setup {
$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`;
@ -658,7 +658,7 @@ sub mysql_setup {
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?
my $userpath = `ls -d ~`; my $userpath = `printenv HOME`;
chomp($userpath); chomp($userpath);
unless ( -e "$userpath/.my.cnf" ) { unless ( -e "$userpath/.my.cnf" ) {
badprint badprint
@ -668,7 +668,7 @@ sub mysql_setup {
return 1; return 1;
} }
else { else {
badprint " Attempted to use login credentials, but they were invalid."; badprint "Attempted to use login credentials, but they were invalid.";
exit 1; exit 1;
} }
exit 1; exit 1;
@ -2948,7 +2948,7 @@ sub dump_result {
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# BEGIN 'MAIN' # BEGIN 'MAIN'
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
headerprint # Header Print headerprint; # Header Print
mysql_setup; # Gotta login first mysql_setup; # Gotta login first
validate_tuner_version; # Check last version validate_tuner_version; # Check last version
os_setup; # Set up some OS variables os_setup; # Set up some OS variables