Merge latest.

This commit is contained in:
Daniel Nichter
2013-03-08 13:02:54 -08:00

View File

@@ -134,7 +134,7 @@ is_deeply(
12347 => $same_data, 12347 => $same_data,
}, },
"Sanity check: No slave data (relay log or master pos) is stored" "Sanity check: No slave data (relay log or master pos) is stored"
); ) or diag(Dumper($rows));
$output = output(sub{ $output = output(sub{
pt_heartbeat::main($node1_dsn, qw(-D test --check)), pt_heartbeat::main($node1_dsn, qw(-D test --check)),