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

For #518 - use new schema for mariab-10.2+

Browse source 
And check for one more column existance
This commit is contained in:
Sergey Dryabzhinsky 2020-12-26 12:02:51 +03:00 committed by GitHub
parent aac1ab2b4d
commit b1a1829362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysqltuner.pl
View file

@ -1769,16 +1769,24 @@ sub security_recommendations {
} }
my $PASS_COLUMN_NAME = 'password'; my $PASS_COLUMN_NAME = 'password';
if ( $myvar{'version'} =~ /5\.7|10\..*MariaDB*/ ) { # New table schema available since mysql-5.7 and mariadb-10.2
# But need to be checked
if ( $myvar{'version'} =~ /5\.7|10\.[2-5]\..*MariaDB*/ ) {
my $password_column_exists = my $password_column_exists =
`$mysqlcmd $mysqllogin -Bse "SELECT 1 FROM information_schema.columns WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME = 'user' AND COLUMN_NAME = 'password'" 2>>/dev/null`; `$mysqlcmd $mysqllogin -Bse "SELECT 1 FROM information_schema.columns WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME = 'user' AND COLUMN_NAME = 'password'" 2>>/dev/null`;
if ($password_column_exists) { my $authstring_column_exists =
`$mysqlcmd $mysqllogin -Bse "SELECT 1 FROM information_schema.columns WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME = 'user' AND COLUMN_NAME = 'authentication_string'" 2>>/dev/null`;
if ($password_column_exists && $authstring_column_exists) {
$PASS_COLUMN_NAME = $PASS_COLUMN_NAME =
"IF(plugin='mysql_native_password', authentication_string, password)"; "IF(plugin='mysql_native_password', authentication_string, password)";
} }
else { else if ($authstring_column_exists) {
$PASS_COLUMN_NAME = 'authentication_string'; $PASS_COLUMN_NAME = 'authentication_string';
} }
else if (!$password_column_exists) {
infoprint "Skipped due to none of known auth columns exists";
return;
}
} }
debugprint "Password column = $PASS_COLUMN_NAME"; debugprint "Password column = $PASS_COLUMN_NAME";