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

Merge pull request #527 from grooverdan/mariadbnames

Browse source 
mariadb is using its on name in mariadb/mariadb-admin
This commit is contained in:
Jean-Marie Renouard 2021-01-27 21:31:16 +01:00 committed by GitHub
commit d9e00040c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysqltuner.pl
View file

@ -666,6 +666,9 @@ sub mysql_setup {
} }
else { else {
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} ); $mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
if ( !-e $mysqladmincmd ) {
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
}
} }
chomp($mysqladmincmd); chomp($mysqladmincmd);
if ( !-e $mysqladmincmd && $opt{mysqladmin} ) { if ( !-e $mysqladmincmd && $opt{mysqladmin} ) {
@ -674,7 +677,7 @@ sub mysql_setup {
exit 1; exit 1;
} }
elsif ( !-e $mysqladmincmd ) { elsif ( !-e $mysqladmincmd ) {
badprint "Couldn't find mysqladmin in your \$PATH. Is MySQL installed?"; badprint "Couldn't find mysqladmin/mariadb-admin in your \$PATH. Is MySQL installed?";
exit 1; exit 1;
} }
if ( $opt{mysqlcmd} ) { if ( $opt{mysqlcmd} ) {
@ -682,6 +685,9 @@ sub mysql_setup {
} }
else { else {
$mysqlcmd = which( "mysql", $ENV{'PATH'} ); $mysqlcmd = which( "mysql", $ENV{'PATH'} );
if ( !-e $mysqlcmd ) {
$mysqlcmd = which( "mariadb", $ENV{'PATH'} );
}
} }
chomp($mysqlcmd); chomp($mysqlcmd);
if ( !-e $mysqlcmd && $opt{mysqlcmd} ) { if ( !-e $mysqlcmd && $opt{mysqlcmd} ) {
@ -690,7 +696,7 @@ sub mysql_setup {
exit 1; exit 1;
} }
elsif ( !-e $mysqlcmd ) { elsif ( !-e $mysqlcmd ) {
badprint "Couldn't find mysql in your \$PATH. Is MySQL installed?"; badprint "Couldn't find mysql/mariadb in your \$PATH. Is MySQL installed?";
exit 1; exit 1;
} }
$mysqlcmd =~ s/\n$//g; $mysqlcmd =~ s/\n$//g;