percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~percona-toolkit-dev/percona-toolkit/fix-osc-bug-897483-and-bug-925007.

Browse Source
This commit is contained in:
Daniel Nichter
2012-02-01 11:05:00 -07:00
parent a9ea686358 5c6c28a6e6
commit d3f23525e7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4140,7 +4140,7 @@ sub main {
} }
} }
my $rename_fk_method = lc $o->get('update-foreign-keys-method'); my $rename_fk_method = lc($o->get('update-foreign-keys-method') || '');
if ( ($rename_fk_method || '') eq 'drop_old_table' ) { if ( ($rename_fk_method || '') eq 'drop_old_table' ) {
$o->set('rename-tables', 0); $o->set('rename-tables', 0);
$o->set('drop-old-table', 0), $o->set('drop-old-table', 0),
@@ -4325,7 +4325,7 @@ sub main {
if ( lc $child_tables eq 'auto_detect' ) { if ( lc $child_tables eq 'auto_detect' ) {
msg("Auto-detecting child tables of $tbl"); msg("Auto-detecting child tables of $tbl");
@child_tables = get_child_tables(%plugin_args); @child_tables = get_child_tables(%plugin_args);
msg("Child tables of $tables{old_table}: " msg("Child tables of $tables{old_tbl}: "
. (@child_tables ? join(', ', @child_tables) : "(none)")); . (@child_tables ? join(', ', @child_tables) : "(none)"));
} }
else { else {

2
t/pt-online-schema-change/check_tables.t
View File

@@ -30,7 +30,7 @@ my $vp = new VersionParser();
my $q = new Quoter(); my $q = new Quoter();
my $tp = new TableParser(Quoter => $q); my $tp = new TableParser(Quoter => $q);
my $du = new MySQLDump(); my $du = new MySQLDump();
my $chunker = new TableChunker(Quoter => $q, MySQLDump => $du); my $chunker = new TableChunker(Quoter => $q, TableParser => $tp);
my $o = new OptionParser(); my $o = new OptionParser();
$o->get_specs("$trunk/bin/pt-online-schema-change"); $o->get_specs("$trunk/bin/pt-online-schema-change");