Merge GLOBAL status after SESSION - the non-global variables (like Percona from #184) will be present but stats are computed from GLOBAL counters which overwrite the SESSION ones if they exist.
This commit is contained in:
jkavalik 2016-04-29 12:56:24 +02:00
parent 591d5ffc19
commit 92dc77e4cd

View file

@ -950,13 +950,13 @@ sub get_all_vars {
debugprint "VERSION: " . $dummyselect . ""; debugprint "VERSION: " . $dummyselect . "";
$result{'MySQL Client'}{'Version'} = $dummyselect; $result{'MySQL Client'}{'Version'} = $dummyselect;
my @mysqlvarlist = select_array("SHOW GLOBAL VARIABLES"); my @mysqlvarlist = select_array("SHOW VARIABLES");
push( @mysqlvarlist, select_array("SHOW VARIABLES") ); push( @mysqlvarlist, select_array("SHOW GLOBAL VARIABLES") );
arr2hash( \%myvar, \@mysqlvarlist ); arr2hash( \%myvar, \@mysqlvarlist );
$result{'Variables'} = %myvar; $result{'Variables'} = %myvar;
my @mysqlstatlist = select_array("SHOW GLOBAL STATUS"); my @mysqlstatlist = select_array("SHOW STATUS");
push( @mysqlstatlist, select_array("SHOW STATUS") ); push( @mysqlstatlist, select_array("SHOW GLOBAL STATUS") );
arr2hash( \%mystat, \@mysqlstatlist ); arr2hash( \%mystat, \@mysqlstatlist );
$result{'Status'} = %mystat; $result{'Status'} = %mystat;