Skip to content

Commit d9e0004

Browse files
authored
Merge pull request #527 from grooverdan/mariadbnames
mariadb is using its on name in mariadb/mariadb-admin
2 parents f2c8ca8 + fa8deec commit d9e0004

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
@@ -666,6 +666,9 @@ sub mysql_setup {
666666
}
667667
else {
668668
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
669+
if ( !-e $mysqladmincmd ) {
670+
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
671+
}
669672
}
670673
chomp($mysqladmincmd);
671674
if ( !-e $mysqladmincmd && $opt{mysqladmin} ) {
@@ -674,14 +677,17 @@ sub mysql_setup {
674677
exit 1;
675678
}
676679
elsif ( !-e $mysqladmincmd ) {
677-
badprint "Couldn't find mysqladmin in your \$PATH. Is MySQL installed?";
680+
badprint "Couldn't find mysqladmin/mariadb-admin in your \$PATH. Is MySQL installed?";
678681
exit 1;
679682
}
680683
if ( $opt{mysqlcmd} ) {
681684
$mysqlcmd = $opt{mysqlcmd};
682685
}
683686
else {
684687
$mysqlcmd = which( "mysql", $ENV{'PATH'} );
688+
if ( !-e $mysqlcmd ) {
689+
$mysqlcmd = which( "mariadb", $ENV{'PATH'} );
690+
}
685691
}
686692
chomp($mysqlcmd);
687693
if ( !-e $mysqlcmd && $opt{mysqlcmd} ) {
@@ -690,7 +696,7 @@ sub mysql_setup {
690696
exit 1;
691697
}
692698
elsif ( !-e $mysqlcmd ) {
693-
badprint "Couldn't find mysql in your \$PATH. Is MySQL installed?";
699+
badprint "Couldn't find mysql/mariadb in your \$PATH. Is MySQL installed?";
694700
exit 1;
695701
}
696702
$mysqlcmd =~ s/\n$//g;

0 commit comments

Comments
 (0)