Merge lp:~percona-dev/percona-xtrabackup/bug_737462 into lp:percona-xtrabackup/2.0
Proposed by
Valentine Gostev
Status: | Superseded |
---|---|
Proposed branch: | lp:~percona-dev/percona-xtrabackup/bug_737462 |
Merge into: | lp:percona-xtrabackup/2.0 |
Diff against target: |
14 lines (+3/-1) 1 file modified
innobackupex (+3/-1) |
To merge this branch: | bzr merge lp:~percona-dev/percona-xtrabackup/bug_737462 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Fixing | ||
Review via email: mp+59174@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-04-27.
Description of the change
Added fix for bug 737462
To post a comment you must log in.
Valentine,
1. $option_ ibbackup_ binary is initialized to 'autodetect', so the condition (!$option_ ibbackup_ binary) will never be true. You should use "if( $option_ ibbackup_ binary eq 'autodetect' ) " instead.
2. Alignment and closing brace placement is wrong.
3. I think it makes more sense to default to 'xtrabackup' rather than 'xtrabackup_51'. Then, in the windows case, for example, you don't even need to specify the binary explicitly.
I think it's easier to show the patch:
--- innobackupex 2011-04-14 17:59:27 +0000
+++ innobackupex 2011-04-27 08:24:18 +0000
@@ -215,7 +215,9 @@ print_version();
# initialize global variables and perform some checks ibbackup_ binary = 'xtrabackup_51'; ibbackup_ binary eq 'autodetect' ) { ibbackup_ binary = 'xtrabackup'; dir/$xtrabackup _binary_ file") {
if ($option_copy_back) {
- $option_
+ if ( $option_
+ $option_
+ }
} elsif ($option_apply_log) {
# Read XtraBackup version from backup dir
if (-e "$backup_