Merge lp:~akopytov/percona-xtrabackup/bug1285166-2.2 into lp:percona-xtrabackup/2.2

Proposed by Alexey Kopytov
Status: Merged
Approved by: Sergei Glushchenko
Approved revision: no longer in the source branch.
Merged at revision: 4947
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1285166-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 37 lines (+0/-20)
1 file modified
storage/innobase/xtrabackup/innobackupex.pl (+0/-20)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1285166-2.2
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 Approve
Review via email: mp+208732@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl 2014-01-23 06:21:41 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl 2014-02-28 06:02:44 +0000
@@ -1313,7 +1313,6 @@
1313 perl_version => \&get_perl_version,1313 perl_version => \&get_perl_version,
1314 perl_module_version => \&get_perl_module_version,1314 perl_module_version => \&get_perl_module_version,
1315 mysql_variable => \&get_mysql_variable,1315 mysql_variable => \&get_mysql_variable,
1316 bin_version => \&get_bin_version,
1317);1316);
13181317
1319sub valid_item {1318sub valid_item {
@@ -1496,25 +1495,6 @@
1496 return \%version_for;1495 return \%version_for;
1497}1496}
14981497
1499sub get_bin_version {
1500 my (%args) = @_;
1501 my $item = $args{item};
1502 my $cmd = $item->{item};
1503 return unless $cmd;
1504
1505 my $sanitized_command = File::Basename::basename($cmd);
1506 PTDEBUG && _d('cmd:', $cmd, 'sanitized:', $sanitized_command);
1507 return if $sanitized_command !~ /\A[a-zA-Z0-9_-]+\z/;
1508
1509 my $output = `$sanitized_command --version 2>&1`;
1510 PTDEBUG && _d('output:', $output);
1511
1512 my ($version) = $output =~ /v?([0-9]+\.[0-9]+(?:\.[\w-]+)?)/;
1513
1514 PTDEBUG && _d('Version for', $sanitized_command, '=', $version);
1515 return $version;
1516}
1517
1518sub _d {1498sub _d {
1519 my ($package, undef, $line) = caller 0;1499 my ($package, undef, $line) = caller 0;
1520 @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }1500 @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }

Subscribers

People subscribed via source and target branches

to all changes: