mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-12 06:00:14 +00:00
Don't run binlog_tests unless MySQL 5.1+. Use output() instead of full_output().
This commit is contained in:
@@ -180,9 +180,10 @@ is(
|
||||
# https://bugs.launchpad.net/percona-toolkit/+bug/1016131
|
||||
# #############################################################################
|
||||
|
||||
($output) = full_output(
|
||||
($output) = output(
|
||||
sub { pt_table_checksum::main(@args, '--tables', 'mysql.user,mysql.host',
|
||||
'--columns', 'some_fale_column') },
|
||||
stderr => 1,
|
||||
);
|
||||
|
||||
like(
|
||||
@@ -196,8 +197,10 @@ like(
|
||||
# https://bugs.launchpad.net/percona-toolkit/+bug/938068
|
||||
# #############################################################################
|
||||
|
||||
{
|
||||
diag("Adding two new slaves to master");
|
||||
SKIP: {
|
||||
skip "binlog_format tests require MySQL 5.1 and newer", 2
|
||||
unless $sandbox_version ge '5.1';
|
||||
|
||||
local $ENV{BINLOG_FORMAT} = 'ROW';
|
||||
diag(`$trunk/sandbox/start-sandbox slave 12348 12345`);
|
||||
local $ENV{BINLOG_FORMAT} = 'MIXED';
|
||||
@@ -220,6 +223,7 @@ is_deeply(
|
||||
|
||||
diag(`$trunk/sandbox/stop-sandbox 12348 12349`);
|
||||
}
|
||||
|
||||
# #############################################################################
|
||||
# Done.
|
||||
# #############################################################################
|
||||
|
Reference in New Issue
Block a user