Fix for 1105077: pt-table-checksum: Confusing error message with binlog_format ROW or MIXED on slave

This commit is contained in:
Brian Fraser
2013-01-30 13:30:31 -03:00
parent 461d9ba45a
commit c91246e1ca
2 changed files with 8 additions and 7 deletions

View File

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

View File

@@ -256,7 +256,7 @@ SKIP: {
$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(
$output,
$re,