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

PT-132 pt-online-schema-change should imply --no-drop-new-table when --no-swap-tables and --no-drop-triggers used

Browse Source
This commit is contained in:
Carlos Salguero
2017-05-05 12:55:23 -03:00
parent 4c7ad1b3d0
commit e32488d592
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-online-schema-change
View File

@@ -8195,9 +8195,9 @@ sub main {
# Explicit --chunk-size disable auto chunk sizing. # Explicit --chunk-size disable auto chunk sizing.
$o->set('chunk-time', 0) if $o->got('chunk-size'); $o->set('chunk-time', 0) if $o->got('chunk-size');
if ($o->get('no-swap-tables') && $o->get('no-drop-triggers')) { if (!$o->get('swap-tables') && !$o->get('drop-triggers')) {
PTDEBUG && _d('Enabling no-drop-new-table since no-swap-tables & no-drop-triggers were specified'); PTDEBUG && _d('Enabling no-drop-new-table since no-swap-tables & no-drop-triggers were specified');
$o->set('no-drop-new-table', 1); $o->set('drop-new-table', 0);
} }
foreach my $opt ( qw(max-load critical-load) ) { foreach my $opt ( qw(max-load critical-load) ) {

21
t/pt-online-schema-change/no_drop_no_swap.t
View File

@@ -68,6 +68,27 @@ is_deeply(
"no swap-tables, drop-triggers, drop-new-table: tables" "no swap-tables, drop-triggers, drop-new-table: tables"
) or diag(Dumper($tables), $output); ) or diag(Dumper($tables), $output);
# #############################################################################
# --no-swap-tables --no-drop-triggers implies --no-drop-new-table
# #############################################################################
$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
$output = output(
sub { pt_online_schema_change::main(
"$master_dsn,D=pt_osc,t=t",
'--alter', 'ADD COLUMN d INT',
qw(--execute --no-swap-tables --no-drop-triggers))
},
stderr => 1,
);
$tables = $dbh1->selectall_arrayref("SHOW TABLES FROM pt_osc");
is_deeply(
$tables,
[ ['_t_new'], ['t'] ],
"no swap-tables, --no-drop-triggers implies --no-drop-new-table"
) or diag(Dumper($tables), $output);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################