File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -666,6 +666,9 @@ sub mysql_setup {
666
666
}
667
667
else {
668
668
$mysqladmincmd = which( " mysqladmin" , $ENV {' PATH' } );
669
+ if ( !-e $mysqladmincmd ) {
670
+ $mysqladmincmd = which( " mariadb-admin" , $ENV {' PATH' } );
671
+ }
669
672
}
670
673
chomp ($mysqladmincmd );
671
674
if ( !-e $mysqladmincmd && $opt {mysqladmin } ) {
@@ -674,14 +677,17 @@ sub mysql_setup {
674
677
exit 1;
675
678
}
676
679
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?" ;
678
681
exit 1;
679
682
}
680
683
if ( $opt {mysqlcmd } ) {
681
684
$mysqlcmd = $opt {mysqlcmd };
682
685
}
683
686
else {
684
687
$mysqlcmd = which( " mysql" , $ENV {' PATH' } );
688
+ if ( !-e $mysqlcmd ) {
689
+ $mysqlcmd = which( " mariadb" , $ENV {' PATH' } );
690
+ }
685
691
}
686
692
chomp ($mysqlcmd );
687
693
if ( !-e $mysqlcmd && $opt {mysqlcmd } ) {
@@ -690,7 +696,7 @@ sub mysql_setup {
690
696
exit 1;
691
697
}
692
698
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?" ;
694
700
exit 1;
695
701
}
696
702
$mysqlcmd =~ s /\n $// g ;
You can’t perform that action at this time.
0 commit comments