Fixed two bugs relating to the database crawler when database names contained a hyphen. (Thanks to Mike
Jackson)
This commit is contained in:
parent
aee3d61131
commit
d63d6fc23a
1 changed files with 10 additions and 4 deletions
|
@ -24,6 +24,7 @@
|
||||||
# Paul Kehrer
|
# Paul Kehrer
|
||||||
# Dave Burgess
|
# Dave Burgess
|
||||||
# Jonathan Hinds
|
# Jonathan Hinds
|
||||||
|
# Mike Jackson
|
||||||
#
|
#
|
||||||
# Inspired by Matthew Montgomery's tuning-primer.sh script:
|
# Inspired by Matthew Montgomery's tuning-primer.sh script:
|
||||||
# http://forge.mysql.com/projects/view.php?id=44
|
# http://forge.mysql.com/projects/view.php?id=44
|
||||||
|
@ -249,13 +250,18 @@ sub check_storage_engines {
|
||||||
my @dblist = `mysql $mysqllogin -Bse "SHOW DATABASES"`;
|
my @dblist = `mysql $mysqllogin -Bse "SHOW DATABASES"`;
|
||||||
foreach my $db (@dblist) {
|
foreach my $db (@dblist) {
|
||||||
chomp($db);
|
chomp($db);
|
||||||
push (@tblist,`mysql $mysqllogin -Bse "SHOW TABLE STATUS FROM $db" | awk '{print \$2,\$7}'`);
|
push (@tblist,`mysql $mysqllogin -Bse "SHOW TABLE STATUS FROM \\\`$db\\\`" | awk '{print \$2,\$7}'`);
|
||||||
foreach my $line (@tblist) {
|
foreach my $line (@tblist) {
|
||||||
$line =~ /([a-zA-Z_]*)\s*(.*)/;
|
$line =~ /([a-zA-Z_]*)\s*(.*)/;
|
||||||
if (defined $enginestats{$1}) {
|
my $engine = $1;
|
||||||
$enginestats{$1} = $enginestats{$1} + $2;
|
my $size = $2;
|
||||||
|
if ($size =~ /^\d+$/) {
|
||||||
|
$size = 0;
|
||||||
|
}
|
||||||
|
if (defined $enginestats{$engine}) {
|
||||||
|
$enginestats{$engine} = $enginestats{$engine} + $size;
|
||||||
} else {
|
} else {
|
||||||
$enginestats{$1} = $2;
|
$enginestats{$engine} = $size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue