various 5.7 test and tool compatibility fixes

This commit is contained in:
frank-cizmich
2015-12-24 09:49:17 -03:00
parent 9616c8a415
commit 6433c99713
11 changed files with 343 additions and 43 deletions

View File

@@ -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",
);

View File

@@ -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