Merge lp:~akopytov/percona-xtrabackup/bug1408375-2.3 into lp:percona-xtrabackup/2.3

Proposed by Alexey Kopytov on 2015-01-31
Status: Merged
Approved by: Alexey Kopytov on 2015-01-31
Approved revision: 5065
Merged at revision: 5065
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1408375-2.3
Merge into: lp:percona-xtrabackup/2.3
Diff against target: 40 lines (+10/-4)
1 file modified
storage/innobase/xtrabackup/innobackupex.pl (+10/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1408375-2.3
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve on 2015-01-31
Review via email: mp+248190@code.launchpad.net

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 2015-01-17 06:50:18 +0000
3+++ storage/innobase/xtrabackup/innobackupex.pl 2015-01-31 15:52:23 +0000
4@@ -511,7 +511,8 @@
5 ref($self->{fh}) eq 'IO::Socket::SSL'
6 or die(qq/SSL connection failed for $host\n/);
7 if ( $self->{fh}->can("verify_hostname") ) {
8- $self->{fh}->verify_hostname( $host, $ssl_verify_args );
9+ $self->{fh}->verify_hostname( $host, $ssl_verify_args )
10+ or die(qq/SSL certificate not valid for $host\n/);
11 }
12 else {
13 my $fh = $self->{fh};
14@@ -1036,11 +1037,12 @@
15 PTDEBUG && _d(scalar @$instances_to_check, 'instances to check');
16 return unless @$instances_to_check;
17
18- my $protocol = 'https'; # optimistic, but...
19+ my $protocol = 'https';
20 eval { require IO::Socket::SSL; };
21 if ( $EVAL_ERROR ) {
22- PTDEBUG && _d($EVAL_ERROR);
23- $protocol = 'http';
24+ PTDEBUG && _d($EVAL_ERROR);
25+ PTDEBUG && _d("SSL not available, won't run version_check");
26+ return;
27 }
28 PTDEBUG && _d('Using', $protocol);
29
30@@ -1477,6 +1479,10 @@
31 return;
32 }
33
34+ if ($item->{item} eq 'MySQL' && $item->{type} eq 'mysql_variable') {
35+ $item->{vars} = ['version_comment', 'version'];
36+ }
37+
38 my @versions;
39 my %version_for;
40 foreach my $instance ( @$instances ) {

Subscribers

People subscribed via source and target branches

to all changes: