From ebacadf0989f3ab944e99fef04ee7e24809d3487 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 27 Mar 2025 21:40:32 +0300 Subject: [PATCH] Revert "PT-2424 - Typo in pt-table-checksum error message "--resume and --no-empty-replicate-table are mutually exclusive"" This reverts commit e964e17f215e907b2ec60e3b3f6afb470bac02ba. --- bin/pt-table-checksum | 4 ++-- t/pt-table-checksum/bugs.t | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum index e262682e..8892fbeb 100755 --- a/bin/pt-table-checksum +++ b/bin/pt-table-checksum @@ -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"; } # ######################################################################## diff --git a/t/pt-table-checksum/bugs.t b/t/pt-table-checksum/bugs.t index c8f4127d..34edfe27 100644 --- a/t/pt-table-checksum/bugs.t +++ b/t/pt-table-checksum/bugs.t @@ -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" -); # # #############################################################################