Skip to content

Commit 828f25d

Browse files
authored
Update Versions for MariaDB
This addresses #707 and #786. Added versiond 11.1, 11.2, and 11.4 to supported list. Removed 10.3, 10.4, 10.7, 10.8, 10.9, and 10.10 (all listed as no longer mintained on the mariadb website). Fix for the deprecation notice from @jadeops.
1 parent 099d38b commit 828f25d

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

mysqltuner.pl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -772,9 +772,9 @@ sub mysql_setup {
772772
$mysqladmincmd = $opt{mysqladmin};
773773
}
774774
else {
775-
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
775+
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
776776
if ( !-e $mysqladmincmd ) {
777-
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
777+
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
778778
}
779779
}
780780
chomp($mysqladmincmd);
@@ -793,9 +793,9 @@ sub mysql_setup {
793793
$mysqlcmd = $opt{mysqlcmd};
794794
}
795795
else {
796-
$mysqlcmd = which( "mysql", $ENV{'PATH'} );
796+
$mysqlcmd = which( "mariadb", $ENV{'PATH'} );
797797
if ( !-e $mysqlcmd ) {
798-
$mysqlcmd = which( "mariadb", $ENV{'PATH'} );
798+
$mysqlcmd = which( "mysql", $ENV{'PATH'} );
799799
}
800800
}
801801
chomp($mysqlcmd);
@@ -2437,15 +2437,12 @@ sub validate_mysql_version {
24372437

24382438
if ( mysql_version_eq(8)
24392439
or mysql_version_eq( 5, 7 )
2440-
or mysql_version_eq( 10, 3 )
2441-
or mysql_version_eq( 10, 4 )
24422440
or mysql_version_eq( 10, 5 )
24432441
or mysql_version_eq( 10, 6 )
2444-
or mysql_version_eq( 10, 7 )
2445-
or mysql_version_eq( 10, 8 )
2446-
or mysql_version_eq( 10, 9 )
2447-
or mysql_version_eq( 10, 10 )
2448-
or mysql_version_eq( 10, 11 ) )
2442+
or mysql_version_eq( 10, 11 )
2443+
or mysql_version_eq( 11, 1 )
2444+
or mysql_version_eq( 11, 2 )
2445+
or mysql_version_eq( 11, 4 ) )
24492446
{
24502447
goodprint "Currently running supported MySQL version "
24512448
. $myvar{'version'} . "";

0 commit comments

Comments
 (0)