mirror of
https://github.com/percona/percona-toolkit.git
synced 2026-04-26 01:02:25 +08:00
Merge commit 'b09e70a' into PT-96
This commit is contained in:
@@ -222,7 +222,6 @@ sub __queue {
|
|||||||
if ( $self->{replace} ) {
|
if ( $self->{replace} ) {
|
||||||
$action = $action eq 'DELETE' ? $action : 'REPLACE';
|
$action = $action eq 'DELETE' ? $action : 'REPLACE';
|
||||||
}
|
}
|
||||||
@$cols = sort(@$cols);
|
|
||||||
push @{$self->{$action}}, [ $row, $cols, $dbh ];
|
push @{$self->{$action}}, [ $row, $cols, $dbh ];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -405,7 +404,7 @@ sub make_row {
|
|||||||
|
|
||||||
# sorts here are just to make this sub testeable
|
# sorts here are just to make this sub testeable
|
||||||
return "$verb INTO $self->{dst_db_tbl}("
|
return "$verb INTO $self->{dst_db_tbl}("
|
||||||
. join(', ', map { $q->quote($_) } sort(@cols))
|
. join(', ', map { $q->quote($_) } @cols)
|
||||||
. ') VALUES ('
|
. ') VALUES ('
|
||||||
. join(', ',
|
. join(', ',
|
||||||
map {
|
map {
|
||||||
@@ -416,7 +415,7 @@ sub make_row {
|
|||||||
is_char => $is_char,
|
is_char => $is_char,
|
||||||
is_float => $is_float,
|
is_float => $is_float,
|
||||||
)
|
)
|
||||||
} sort(@cols))
|
} @cols)
|
||||||
. ')';
|
. ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user