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

mariadb is using its on name in mariadb/mariadb-admin

Browse source 
The mysql client, mysql, in mariadb is starting to be labeled mariadb.
Likewise mysqladmin is getting called mariadb-admin. Lets check
for these names as well.
This commit is contained in:
Daniel Black 2021-01-27 17:25:30 +11:00
parent 9a9ff555ee
commit fa8deec762
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

@ -665,6 +665,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} ) {
@ -673,7 +676,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} ) {
@ -681,6 +684,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} ) {
@ -689,7 +695,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;