Merge pull request #537 from grooverdan/min_dblist

minimal database list retrieval
This commit is contained in:
Jean-Marie Renouard 2021-01-28 18:21:11 +01:00 committed by GitHub
commit 22789d1c7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -239,6 +239,9 @@ my $end = ( $opt{nocolor} == 0 ) ? "\e[0m" : "";
# Checks for supported or EOL'ed MySQL versions # Checks for supported or EOL'ed MySQL versions
my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro ); my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro );
# Database
my @dblist;
# Super structure containing all information # Super structure containing all information
my %result; my %result;
$result{'MySQLTuner'}{'version'} = $tunerversion; $result{'MySQLTuner'}{'version'} = $tunerversion;
@ -5850,8 +5853,8 @@ sub mysql_databases {
return; return;
} }
my @dblist = select_array( @dblist = select_array(
"SELECT DISTINCT TABLE_SCHEMA FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );" "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );"
); );
infoprint "There is " . scalar(@dblist) . " Database(s)."; infoprint "There is " . scalar(@dblist) . " Database(s).";
my @totaldbinfo = split /\s/, my @totaldbinfo = split /\s/,
@ -6028,9 +6031,6 @@ sub mysql_tables {
if (mysql_version_ge(8) and not mysql_version_eq(10)) { if (mysql_version_ge(8) and not mysql_version_eq(10)) {
infoprint "MySQL and Percona version 8 and greater have remove PROCEDURE ANALYSE feature" infoprint "MySQL and Percona version 8 and greater have remove PROCEDURE ANALYSE feature"
} }
my @dblist = select_array(
"SELECT DISTINCT TABLE_SCHEMA FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );"
);
foreach (@dblist) { foreach (@dblist) {
my $dbname = $_; my $dbname = $_;
next unless defined $_; next unless defined $_;