percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-09 18:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update MasterSlave.pm in all tools.

Browse Source
This commit is contained in:
Daniel Nichter
2011-08-23 08:31:04 -06:00
parent ff59f479e6
commit 4715afc7c0
8 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-archiver
View File

@@ -2981,7 +2981,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -3183,7 +3185,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-heartbeat
View File

@@ -289,7 +289,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -491,7 +493,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-kill
View File

@@ -2693,7 +2693,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -2895,7 +2897,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-query-digest
View File

@@ -10681,7 +10681,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -10883,7 +10885,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-slave-find
View File

@@ -1670,7 +1670,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -1872,7 +1874,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-slave-restart
View File

@@ -1830,7 +1830,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -2032,7 +2034,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

2
bin/pt-table-checksum
View File

@@ -4056,7 +4056,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;

6
bin/pt-table-sync
View File

@@ -6072,7 +6072,9 @@ sub get_master_status {
MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
$sth->execute();
my ($ms) = @{$sth->fetchall_arrayref({})};
MKDEBUG && _d(@$ms);
MKDEBUG && _d(
$ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
: '');
if ( !$ms || scalar keys %$ms < 2 ) {
MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
@@ -6274,7 +6276,7 @@ sub is_replication_thread {
my ( $self, $query, %args ) = @_;
return unless $query;
my $type = lc $args{type} || 'all';
my $type = lc($args{type} || 'all');
die "Invalid type: $type"
unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;