mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-10-17 07:54:14 +00:00
Merge pull request #997 from percona/PT-2467_t_pt-show-grants_basics.t_t_pt-table-checksum_basics.t_t_pt-table-sync_filters.t_t_pt-upgrade_diff_rows.t_fail_with_the_latest_PT
PT-2467 - t/pt-show-grants/basics.t t/pt-table-checksum/basics.t t/pt…
This commit is contained in:
@@ -84,7 +84,7 @@ unlike(
|
|||||||
);
|
);
|
||||||
|
|
||||||
$output = output(
|
$output = output(
|
||||||
sub { pt_show_grants::main('-F', $cnf, '--ignore', 'baron,msandbox,root,root@localhost,user,mysql.session@localhost,mysql.sys@localhost,sys,mysql.infoschema@localhost'); }
|
sub { pt_show_grants::main('-F', $cnf, '--ignore', 'baron,msandbox,root,root@localhost,user,mysql.session@localhost,mysql.sys@localhost,sys,mysql.infoschema@localhost,percona.telemetry@localhost'); }
|
||||||
);
|
);
|
||||||
unlike(
|
unlike(
|
||||||
$output,
|
$output,
|
||||||
|
@@ -28,7 +28,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
|
|||||||
0 0 0 0 mysql.time_zone_name
|
0 0 0 0 mysql.time_zone_name
|
||||||
0 0 0 0 mysql.time_zone_transition
|
0 0 0 0 mysql.time_zone_transition
|
||||||
0 0 0 0 mysql.time_zone_transition_type
|
0 0 0 0 mysql.time_zone_transition_type
|
||||||
0 1 5 0 mysql.user
|
0 1 6 0 mysql.user
|
||||||
0 0 29 0 percona_test.checksums
|
0 0 29 0 percona_test.checksums
|
||||||
0 0 1 0 percona_test.sentinel
|
0 0 1 0 percona_test.sentinel
|
||||||
0 0 200 0 sakila.actor
|
0 0 200 0 sakila.actor
|
||||||
|
@@ -28,7 +28,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
|
|||||||
0 0 0 0 mysql.time_zone_name
|
0 0 0 0 mysql.time_zone_name
|
||||||
0 0 0 0 mysql.time_zone_transition
|
0 0 0 0 mysql.time_zone_transition
|
||||||
0 0 0 0 mysql.time_zone_transition_type
|
0 0 0 0 mysql.time_zone_transition_type
|
||||||
0 1 5 0 mysql.user
|
0 1 6 0 mysql.user
|
||||||
0 0 29 0 percona_test.checksums
|
0 0 29 0 percona_test.checksums
|
||||||
0 0 1 0 percona_test.sentinel
|
0 0 1 0 percona_test.sentinel
|
||||||
0 0 200 0 sakila.actor
|
0 0 200 0 sakila.actor
|
||||||
|
@@ -147,7 +147,7 @@ foreach my $args (
|
|||||||
my $stm = $args->[-1] eq '--sync-to-source' ? ' --sync-to-source' : '';
|
my $stm = $args->[-1] eq '--sync-to-source' ? ' --sync-to-source' : '';
|
||||||
|
|
||||||
test_filters(
|
test_filters(
|
||||||
name => $stm . "--replicate --tables t1",
|
name => $stm . " --replicate --tables t1",
|
||||||
cmds => [@$args,
|
cmds => [@$args,
|
||||||
qw(--tables t1)],
|
qw(--tables t1)],
|
||||||
res => [qw(d1.t1 d2.t1 percona.checksums)],
|
res => [qw(d1.t1 d2.t1 percona.checksums)],
|
||||||
|
@@ -104,12 +104,12 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
|
|||||||
[
|
[
|
||||||
2,
|
2,
|
||||||
[ 'mysql.infoschema' ],
|
[ 'mysql.infoschema' ],
|
||||||
[ 'mysql.sys' ]
|
[ 'percona.telemetry' ]
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
4,
|
3,
|
||||||
[ 'mysql.sys' ],
|
[ 'mysql.session' ],
|
||||||
[ 'mysql.infoschema' ]
|
[ 'mysql.sys' ]
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -146,7 +146,7 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
|
|||||||
} elsif ($sandbox_version ge '8.0') {
|
} elsif ($sandbox_version ge '8.0') {
|
||||||
$expect =[
|
$expect =[
|
||||||
[
|
[
|
||||||
4,
|
5,
|
||||||
undef,
|
undef,
|
||||||
[
|
[
|
||||||
[ 'mysql.infoschema' ],
|
[ 'mysql.infoschema' ],
|
||||||
@@ -189,7 +189,7 @@ if ($sandbox_version ge '5.7' and $sandbox_version lt '8.0') {
|
|||||||
} elsif ($sandbox_version ge '8.0') {
|
} elsif ($sandbox_version ge '8.0') {
|
||||||
$expect =[
|
$expect =[
|
||||||
[
|
[
|
||||||
4,
|
5,
|
||||||
[
|
[
|
||||||
[
|
[
|
||||||
'mysql.infoschema'
|
'mysql.infoschema'
|
||||||
|
Reference in New Issue
Block a user