diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index b19338f9..3bcf3f4f 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -10634,7 +10634,7 @@ sub main { $plugin->after_copy_rows(); } if ( $o->get('preserve-triggers') ) { - if ( !$o->get('swap-tables') && $o->get('drop-new-table') && !$o->get('alter-foreign-keys-method') eq "drop-swap" ) { + if ( !$o->get('swap-tables') && $o->get('drop-new-table') && ( $o->get('alter-foreign-keys-method') ne "drop_swap" ) ) { print ts("Skipping triggers creation since --no-swap-tables was specified along with --drop-new-table\n"); } else { print ts("Adding original triggers to new table.\n"); diff --git a/t/pt-online-schema-change/pt-1919.t b/t/pt-online-schema-change/pt-1919.t index 97e353a7..bec1fb37 100644 --- a/t/pt-online-schema-change/pt-1919.t +++ b/t/pt-online-schema-change/pt-1919.t @@ -312,7 +312,7 @@ sub test_alter_table { $orig_triggers, $new_triggers, 'Triggers should remain in place', - ); + ) or diag($output); return; }