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
1=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
2--- storage/innobase/xtrabackup/innobackupex.pl 2014-01-23 06:21:41 +0000
3+++ storage/innobase/xtrabackup/innobackupex.pl 2014-02-28 06:02:44 +0000
4@@ -1313,7 +1313,6 @@
5 perl_version => \&get_perl_version,
6 perl_module_version => \&get_perl_module_version,
7 mysql_variable => \&get_mysql_variable,
8- bin_version => \&get_bin_version,
9 );
10
11 sub valid_item {
12@@ -1496,25 +1495,6 @@
13 return \%version_for;
14 }
15
16-sub get_bin_version {
17- my (%args) = @_;
18- my $item = $args{item};
19- my $cmd = $item->{item};
20- return unless $cmd;
21-
22- my $sanitized_command = File::Basename::basename($cmd);
23- PTDEBUG && _d('cmd:', $cmd, 'sanitized:', $sanitized_command);
24- return if $sanitized_command !~ /\A[a-zA-Z0-9_-]+\z/;
25-
26- my $output = `$sanitized_command --version 2>&1`;
27- PTDEBUG && _d('output:', $output);
28-
29- my ($version) = $output =~ /v?([0-9]+\.[0-9]+(?:\.[\w-]+)?)/;
30-
31- PTDEBUG && _d('Version for', $sanitized_command, '=', $version);
32- return $version;
33-}
34-
35 sub _d {
36 my ($package, undef, $line) = caller 0;
37 @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }

Subscribers

People subscribed via source and target branches

to all changes: