percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 02:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "PT-2424 - Typo in pt-table-checksum error message "--resume and --no-empty-replicate-table are mutually exclusive""

Browse Source 
This reverts commit e964e17f21.
This commit is contained in:
Sveta Smirnova
2025-03-27 21:40:32 +03:00
parent c49c58db2b
commit ebacadf098
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-table-checksum
View File

@@ -10272,11 +10272,11 @@ sub main {
if ( $o->get('truncate-replicate-table') && $o->get('resume') ) {
die "--resume and truncate-replicate-table are mutually exclusive";
die "--resume and truncate-replicate-table are mutually exclusive";
}
if ( $o->get('truncate-replicate-table') && !$o->get('empty-replicate-table') ) {
die "--truncate-replicate-table and --no-empty-replicate-table are mutually exclusive";
die "--resume and --no-empty-replicate-table are mutually exclusive";
}
# ########################################################################

23
t/pt-table-checksum/bugs.t
View File

@@ -378,29 +378,6 @@ is(
diag(`/tmp/12346/stop >/dev/null`);
diag(`/tmp/12346/start >/dev/null`);
# #############################################################################
# typo in pt-table-checksum error message
# https://perconadev.atlassian.net/browse/PT-2424
# #############################################################################
$output = output(sub {
pt_table_checksum::main($source_dsn,
qw(--no-empty-replicate-table --truncate-replicate-table)
)},
stderr => 1,
);
unlike(
$output,
qr/--resume and --no-empty-replicate-table are mutually exclusive/,
"PT-2424: no typo in the error message"
);
like(
$output,
qr/--truncate-replicate-table and --no-empty-replicate-table are mutually exclusive/,
"PT-2424: correct error message"
);
#
# #############################################################################