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

Update Versions for MariaDB

Browse source 
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.
This commit is contained in:
Brian Devendorf 2024-07-14 23:59:03 -05:00 committed by GitHub
parent 099d38b11d
commit 828f25d828
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mysqltuner.pl
View file

@ -772,9 +772,9 @@ sub mysql_setup {
$mysqladmincmd = $opt{mysqladmin}; $mysqladmincmd = $opt{mysqladmin};
} }
else { else {
$mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} ); $mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} );
if ( !-e $mysqladmincmd ) { if ( !-e $mysqladmincmd ) {
$mysqladmincmd = which( "mariadb-admin", $ENV{'PATH'} ); $mysqladmincmd = which( "mysqladmin", $ENV{'PATH'} );
} }
} }
chomp($mysqladmincmd); chomp($mysqladmincmd);
@ -793,9 +793,9 @@ sub mysql_setup {
$mysqlcmd = $opt{mysqlcmd}; $mysqlcmd = $opt{mysqlcmd};
} }
else { else {
$mysqlcmd = which( "mysql", $ENV{'PATH'} ); $mysqlcmd = which( "mariadb", $ENV{'PATH'} );
if ( !-e $mysqlcmd ) { if ( !-e $mysqlcmd ) {
$mysqlcmd = which( "mariadb", $ENV{'PATH'} ); $mysqlcmd = which( "mysql", $ENV{'PATH'} );
} }
} }
chomp($mysqlcmd); chomp($mysqlcmd);
@ -2437,15 +2437,12 @@ sub validate_mysql_version {
if ( mysql_version_eq(8) if ( mysql_version_eq(8)
or mysql_version_eq( 5, 7 ) or mysql_version_eq( 5, 7 )
or mysql_version_eq( 10, 3 )
or mysql_version_eq( 10, 4 )
or mysql_version_eq( 10, 5 ) or mysql_version_eq( 10, 5 )
or mysql_version_eq( 10, 6 ) or mysql_version_eq( 10, 6 )
or mysql_version_eq( 10, 7 ) or mysql_version_eq( 10, 11 )
or mysql_version_eq( 10, 8 ) or mysql_version_eq( 11, 1 )
or mysql_version_eq( 10, 9 ) or mysql_version_eq( 11, 2 )
or mysql_version_eq( 10, 10 ) or mysql_version_eq( 11, 4 ) )
or mysql_version_eq( 10, 11 ) )
{ {
goodprint "Currently running supported MySQL version " goodprint "Currently running supported MySQL version "
. $myvar{'version'} . ""; . $myvar{'version'} . "";