mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-27 16:12:04 +00:00
various 5.7 test and tool compatibility fixes
This commit is contained in:
@@ -123,6 +123,7 @@ my $result = do { local $/; <$fh> }; #"
|
||||
$result =~ s/Version.*/Version/g;
|
||||
$result =~ s/Uptime.*/Uptime/g;
|
||||
$result =~ s/[0-9]* seconds/0 seconds/g;
|
||||
$result =~ s/Binary logging.*/Binary logging/g;
|
||||
|
||||
my $innodb_re = qr/InnoDB version\s+(.*)/;
|
||||
my (@innodb_versions) = $result =~ /$innodb_re/g;
|
||||
@@ -150,10 +151,12 @@ is(
|
||||
"...and for the first slave"
|
||||
);
|
||||
|
||||
|
||||
|
||||
ok(
|
||||
no_diff($result, ($sandbox_version ge '5.1'
|
||||
? "t/pt-slave-find/samples/summary001.txt"
|
||||
: "t/pt-slave-find/samples/summary001-5.0.txt"), cmd_output => 1),
|
||||
: "t/pt-slave-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1),
|
||||
"Summary report format",
|
||||
);
|
||||
|
||||
|
@@ -4,7 +4,7 @@ Server ID 12345
|
||||
Uptime
|
||||
Replication Is not a slave, has 1 slaves connected, is not read_only
|
||||
Filters
|
||||
Binary logging STATEMENT
|
||||
Binary logging
|
||||
Slave status
|
||||
Slave mode STRICT
|
||||
Auto-increment increment 1, offset 1
|
||||
@@ -15,7 +15,7 @@ InnoDB version BUILTIN
|
||||
Uptime
|
||||
Replication Is a slave, has 1 slaves connected, is read_only
|
||||
Filters
|
||||
Binary logging STATEMENT
|
||||
Binary logging
|
||||
Slave status 0 seconds behind, running, no errors
|
||||
Slave mode STRICT
|
||||
Auto-increment increment 1, offset 1
|
||||
@@ -26,7 +26,7 @@ InnoDB version BUILTIN
|
||||
Uptime
|
||||
Replication Is a slave, has 0 slaves connected, is read_only
|
||||
Filters
|
||||
Binary logging STATEMENT
|
||||
Binary logging
|
||||
Slave status 0 seconds behind, running, no errors
|
||||
Slave mode STRICT
|
||||
Auto-increment increment 1, offset 1
|
||||
|
Reference in New Issue
Block a user