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

fix things looking for hardcoded mysqlbinlog path (t/pt-table-checksum/replication_filters.t and t/pt-table-sync/traces.t)

Browse Source
This commit is contained in:
baron
2012-06-06 21:29:34 -04:00
parent 7facc149a8
commit 7a57261843
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
t/pt-table-checksum/replication_filters.t
View File

@@ -271,8 +271,15 @@ $master_dbh = $sb->get_dbh_for('master');
$row = $master_dbh->selectrow_hashref('show master status');
pt_table_checksum::main(@args, qw(--quiet));
my $mysqlbinlog = `which mysqlbinlog`;
if ( $mysqlbinlog ) {
chomp $mysqlbinlog;
}
elsif ( -x "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog" ) {
$mysqlbinlog = "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog";
}
$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} --start-position=$row->{position} | grep 'use ' | grep -v '^# Warning' | sort -u`;
$output = `$mysqlbinlog /tmp/12345/data/$row->{file} --start-position=$row->{position} | grep 'use ' | grep -v '^# Warning' | sort -u`;
is(
$output,
@@ -289,7 +296,7 @@ $row = $master_dbh->selectrow_hashref('show master status');
pt_table_checksum::main(@args, qw(--quiet --replicate-database percona));
$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} --start-position=$row->{position} | grep 'use ' | grep -v '^# Warning'`;
$output = `$mysqlbinlog /tmp/12345/data/$row->{file} --start-position=$row->{position} | grep 'use ' | grep -v '^# Warning'`;
is(
$output,
"use percona/*!*/;

7
t/pt-table-sync/traces.t
View File

@@ -25,7 +25,12 @@ my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1');
my $mysqlbinlog = `which mysqlbinlog`;
chomp $mysqlbinlog if $mysqlbinlog;
if ( $mysqlbinlog ) {
chomp $mysqlbinlog;
}
elsif ( -x "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog" ) {
$mysqlbinlog = "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog";
}
if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';