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

Fix for bug 1099836: pt-online-schema-change fails with "Duplicate entry" on MariaDB

Browse Source
This commit is contained in:
Brian Fraser
2013-01-30 12:33:42 -03:00
parent 461d9ba45a
commit a9661d09eb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3270,7 +3270,7 @@ sub check_table {
die "I need a $arg argument" unless $args{$arg}; die "I need a $arg argument" unless $args{$arg};
} }
my ($dbh, $db, $tbl) = @args{@required_args}; my ($dbh, $db, $tbl) = @args{@required_args};
my $q = $self->{Quoter}; my $q = $self->{Quoter} || 'Quoter';
my $db_tbl = $q->quote($db, $tbl); my $db_tbl = $q->quote($db, $tbl);
PTDEBUG && _d('Checking', $db_tbl); PTDEBUG && _d('Checking', $db_tbl);
@@ -9777,6 +9777,7 @@ sub exec_nibble {
# Ignore this warning because we have purposely set statement-based # Ignore this warning because we have purposely set statement-based
# replication. # replication.
1592 => 1, 1592 => 1,
1062 => 1,
); );
# Warn once per-table for these error codes if the error message # Warn once per-table for these error codes if the error message
@@ -9851,6 +9852,7 @@ sub exec_nibble {
. "Specify --statistics to see a count of all " . "Specify --statistics to see a count of all "
. "suppressed warnings and errors.\n"; . "suppressed warnings and errors.\n";
} }
warn $err;
} }
} }
else { else {

2
lib/TableParser.pm
View File

@@ -302,7 +302,7 @@ sub check_table {
die "I need a $arg argument" unless $args{$arg}; die "I need a $arg argument" unless $args{$arg};
} }
my ($dbh, $db, $tbl) = @args{@required_args}; my ($dbh, $db, $tbl) = @args{@required_args};
my $q = $self->{Quoter}; my $q = $self->{Quoter} || 'Quoter';
my $db_tbl = $q->quote($db, $tbl); my $db_tbl = $q->quote($db, $tbl);
PTDEBUG && _d('Checking', $db_tbl); PTDEBUG && _d('Checking', $db_tbl);