percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged fix-1105077-ptc-binlog_format-error-2.1.9

Browse Source
This commit is contained in:
Brian Fraser
2013-01-31 12:13:41 -03:00
parent 461d9ba45a c91246e1ca
commit 90d085d906
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/pt-table-checksum
View File

@@ -8765,12 +8765,13 @@ sub main {
} }
if ( $master_binlog ne $slave_binlog ) { if ( $master_binlog ne $slave_binlog ) {
$err .= $master_cxn->name() . " has binlog_format " $err .= "Replica " . $slave_cxn->name()
. $master_binlog . " but replica " . $slave_cxn->name() . qq{ has binlog_format $slave_binlog which could cause }
. " has binlog_format $slave_binlog. This could cause " . qq{pt-table-checksum to break replication. Please read }
. "pt-table-checksum to break replication. " . qq{"Replicas using row-based replication" in the }
. "If you understand the risks, specify " . qq{LIMITATIONS section of the tool's documentation. }
. "--no-check-binlog-format to disable this check.\n"; . qq{If you understand the risks, specify }
. qq{--no-check-binlog-format to disable this check.\n};
} }
} }
die $err if $err; die $err if $err;

2
t/pt-table-checksum/bugs.t
View File

@@ -256,7 +256,7 @@ SKIP: {
$output = output( sub { pt_table_checksum::main(@args) }, stderr => 1 ); $output = output( sub { pt_table_checksum::main(@args) }, stderr => 1 );
my $re = qr/ has binlog_format .*? has binlog_format (\S+)\./msi; my $re = qr/Replica .+? has binlog_format (\S+)/msi;
like( like(
$output, $output,
$re, $re,