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

Correct return code in case of invalid login or missing data

Browse source
This commit is contained in:
Jean-Marie RENOUARD 2015-08-24 09:58:52 +02:00
parent 7c51a70b36
commit 111a4a3776
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysqltuner.pl
View file

@ -70,6 +70,7 @@ my %opt = (
"dbstat" => 0, "dbstat" => 0,
"idxstat" => 0, "idxstat" => 0,
"skippassword" => 0, "skippassword" => 0,
"noask" => 0
); );
# Gather the options from the command line # Gather the options from the command line
@ -80,7 +81,7 @@ GetOptions(
'pass=s', 'skipsize', 'checkversion', 'mysqladmin=s', 'pass=s', 'skipsize', 'checkversion', 'mysqladmin=s',
'mysqlcmd=s', 'help', 'buffers', 'skippassword', 'mysqlcmd=s', 'help', 'buffers', 'skippassword',
'passwordfile=s', 'reportfile=s', 'silent', 'dbstat', 'passwordfile=s', 'reportfile=s', 'silent', 'dbstat',
'idxstat', 'idxstat', 'noask'
); );
if ( defined $opt{'help'} && $opt{'help'} == 1 ) { usage(); } if ( defined $opt{'help'} && $opt{'help'} == 1 ) { usage(); }
@ -106,6 +107,7 @@ sub usage {
. " --pass <password> Password to use for authentication\n" . " --pass <password> Password to use for authentication\n"
. " --mysqladmin <path> Path to a custom mysqladmin executable\n" . " --mysqladmin <path> Path to a custom mysqladmin executable\n"
. " --mysqlcmd <path> Path to a custom mysql executable\n" . "\n" . " --mysqlcmd <path> Path to a custom mysql executable\n" . "\n"
. " --noask Dont ask password if needed\n" . "\n"
. " Performance and Reporting Options\n" . " Performance and Reporting Options\n"
. " --skipsize Don't enumerate tables and their types/sizes (default: on)\n" . " --skipsize Don't enumerate tables and their types/sizes (default: on)\n"
. " (Recommended for servers with many tables)\n" . " (Recommended for servers with many tables)\n"
@ -124,7 +126,7 @@ sub usage {
. " --idxstat Print index information\n" . " --idxstat Print index information\n"
. " --nocolor Don't print output in color\n" . " --nocolor Don't print output in color\n"
. " --buffers Print global and per-thread buffer values\n"; . " --buffers Print global and per-thread buffer values\n";
exit; exit 0;
} }
my $devnull = File::Spec->devnull(); my $devnull = File::Spec->devnull();
@ -520,6 +522,11 @@ sub mysql_setup {
return 1; return 1;
} }
else { else {
if ( defined($opt{'noask'}) ) {
badprint "Attempted to use login credentials, but they were invalid";
exit 1;
}
print STDERR "Please enter your MySQL administrative login: "; print STDERR "Please enter your MySQL administrative login: ";
my $name = <>; my $name = <>;
print STDERR "Please enter your MySQL administrative password: "; print STDERR "Please enter your MySQL administrative password: ";