Minor accessing undefined variable bug to fix eventually #383

This commit is contained in:
Jean-Marie RENOUARD 2018-08-06 12:38:06 +02:00
parent 07e76709ee
commit 7429b7c15c

View file

@ -1067,6 +1067,9 @@ sub get_all_vars {
push( @mysqlstatlist, select_array("SHOW GLOBAL STATUS") ); push( @mysqlstatlist, select_array("SHOW GLOBAL STATUS") );
arr2hash( \%mystat, \@mysqlstatlist ); arr2hash( \%mystat, \@mysqlstatlist );
$result{'Status'} = \%mystat; $result{'Status'} = \%mystat;
unless( defined ($myvar{'innodb_support_xa'}) ) {
$myvar{'innodb_support_xa'}='ON';
}
$myvar{'have_galera'} = "NO"; $myvar{'have_galera'} = "NO";
if ( defined( $myvar{'wsrep_provider_options'} ) if ( defined( $myvar{'wsrep_provider_options'} )
@ -1847,12 +1850,8 @@ sub get_replication_status {
. " server(s)."; . " server(s).";
} }
infoprint "Binlog format: " . $myvar{'binlog_format'}; infoprint "Binlog format: " . $myvar{'binlog_format'};
infoprint "XA support enabled: " infoprint "XA support enabled: " . $myvar{'innodb_support_xa'};
. (
defined( $myvar{'innodb_support_xa'} )
? $myvar{'innodb_support_xa'}
: 'UNKNOWN'
);
infoprint "Semi synchronous replication Master: " infoprint "Semi synchronous replication Master: "
. ( . (
defined( $myvar{'rpl_semi_sync_master_enabled'} ) defined( $myvar{'rpl_semi_sync_master_enabled'} )
@ -1986,7 +1985,7 @@ sub check_architecture {
$arch = 64; $arch = 64;
goodprint "Operating on 64-bit architecture"; goodprint "Operating on 64-bit architecture";
} }
elsif ( `uname` !~ /SunOS/ && `uname -m` =~ /64/ ) { elsif ( `uname` !~ /SunOS/ && `uname -m` =~ /64/ && `uname -m` !~ /s390x/ ) {
$arch = 64; $arch = 64;
goodprint "Operating on 64-bit architecture"; goodprint "Operating on 64-bit architecture";
} }