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

Using --defaults-file ignores the .my.cnf #605

Browse source
This commit is contained in:
Jean-Marie RENOUARD 2022-09-13 15:55:35 +02:00
parent 2259dfc3b2
commit fdd42e7685
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mysqltuner.pl
View file

@ -1,5 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# mysqltuner.pl - Version 2.0.6 # mysqltuner.pl - Version 2.0.7
# High Performance MySQL Tuning Script # High Performance MySQL Tuning Script
# Copyright (C) 2006-2022 Major Hayden - major@mhtx.net # Copyright (C) 2006-2022 Major Hayden - major@mhtx.net
# Copyright (C) 2015-2022 Jean-Marie Renouard - jmrenouard@gmail.com # Copyright (C) 2015-2022 Jean-Marie Renouard - jmrenouard@gmail.com
@ -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.6"; my $tunerversion = "2.0.7";
my ( @adjvars, @generalrec ); my ( @adjvars, @generalrec );
# Set defaults # Set defaults
@ -108,6 +108,7 @@ my %opt = (
"reportfile" => 0, "reportfile" => 0,
"verbose" => 0, "verbose" => 0,
"defaults-file" => '', "defaults-file" => '',
"defaults-extra-file" => '',
"protocol" => '', "protocol" => '',
); );
@ -140,6 +141,7 @@ GetOptions(
'pfstat', 'nopfstat', 'pfstat', 'nopfstat',
'idxstat', 'noidxstat', 'idxstat', 'noidxstat',
'server-log=s', 'protocol=s', 'server-log=s', 'protocol=s',
'defaults-extra-file=s',
) )
or pod2usage( or pod2usage(
-exitval => 1, -exitval => 1,
@ -915,6 +917,20 @@ sub mysql_setup {
return 1; return 1;
} }
} }
elsif ( $opt{'defaults-extra-file'} ne '' and -r "$opt{'defaults-extra-file'}" ) {
# defaults-extra-file
debugprint "defaults extra file detected: $opt{'defaults-extra-file'}";
my $mysqlclidefaults = `$mysqlcmd --print-defaults`;
debugprint "MySQL Client Extra Default File: $opt{'defaults-extra-file'}";
$mysqllogin = "--defaults-extra-file=" . $opt{'defaults-extra-file'};
my $loginstatus = `$mysqladmincmd $mysqllogin ping 2>&1`;
if ( $loginstatus =~ /mysqld is alive/ ) {
goodprint "Logged in using credentials from extra defaults file account.";
return 1;
}
}
else { else {
# It's not Plesk or Debian, we should try a login # It's not Plesk or Debian, we should try a login
debugprint "$mysqladmincmd $remotestring ping 2>&1"; debugprint "$mysqladmincmd $remotestring ping 2>&1";
@ -6905,7 +6921,7 @@ __END__
=head1 NAME =head1 NAME
MySQLTuner 2.0.6 - MySQL High Performance Tuning Script MySQLTuner 2.0.7 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES =head1 IMPORTANT USAGE GUIDELINES
@ -6928,6 +6944,7 @@ You must provide the remote server's total memory when connecting to other serve
--mysqladmin <path> Path to a custom mysqladmin executable --mysqladmin <path> Path to a custom mysqladmin executable
--mysqlcmd <path> Path to a custom mysql executable --mysqlcmd <path> Path to a custom mysql executable
--defaults-file <path> Path to a custom .my.cnf --defaults-file <path> Path to a custom .my.cnf
--defaults-extra-file <path> Path to a extra custom config file
--server-log <path> Path to explicit log file (error_log) --server-log <path> Path to explicit log file (error_log)
=head1 PERFORMANCE AND REPORTING OPTIONS =head1 PERFORMANCE AND REPORTING OPTIONS