Skip to content

Commit fa8deec

Browse files
committed
mariadb is using its on name in mariadb/mariadb-admin
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.
1 parent 9a9ff55 commit fa8deec

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

mysqltuner.pl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,9 @@ sub mysql_setup {
665665
}
666666
else {
667667
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
668+
if ( !-e $mysqladmincmd ) {
669+
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
670+
}
668671
}
669672
chomp($mysqladmincmd);
670673
if ( !-e $mysqladmincmd && $opt{mysqladmin} ) {
@@ -673,14 +676,17 @@ sub mysql_setup {
673676
exit 1;
674677
}
675678
elsif ( !-e $mysqladmincmd ) {
676-
badprint "Couldn't find mysqladmin in your \$PATH. Is MySQL installed?";
679+
badprint "Couldn't find mysqladmin/mariadb-admin in your \$PATH. Is MySQL installed?";
677680
exit 1;
678681
}
679682
if ( $opt{mysqlcmd} ) {
680683
$mysqlcmd = $opt{mysqlcmd};
681684
}
682685
else {
683686
$mysqlcmd = which( "mysql", $ENV{'PATH'} );
687+
if ( !-e $mysqlcmd ) {
688+
$mysqlcmd = which( "mariadb", $ENV{'PATH'} );
689+
}
684690
}
685691
chomp($mysqlcmd);
686692
if ( !-e $mysqlcmd && $opt{mysqlcmd} ) {
@@ -689,7 +695,7 @@ sub mysql_setup {
689695
exit 1;
690696
}
691697
elsif ( !-e $mysqlcmd ) {
692-
badprint "Couldn't find mysql in your \$PATH. Is MySQL installed?";
698+
badprint "Couldn't find mysql/mariadb in your \$PATH. Is MySQL installed?";
693699
exit 1;
694700
}
695701
$mysqlcmd =~ s/\n$//g;

0 commit comments

Comments
 (0)