Percona XtraBackup moved to https://jira.percona.com/projects/PXB

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

  1. bug1375241
  2. Merge into 2.2
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 5029
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1375241
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 44 lines (+8/-7)
1 file modified
storage/innobase/xtrabackup/innobackupex.pl (+8/-7)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1375241
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+236333@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

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-09-19 08:17:24 +0000
3+++ storage/innobase/xtrabackup/innobackupex.pl 2014-09-29 13:39:38 +0000
4@@ -2700,7 +2700,8 @@
5 print STDERR "$prefix Suspend file '$suspend_file'\n\n";
6 wait_for_ibbackup_file_create($suspend_file);
7 $now = current_time();
8- open XTRABACKUP_PID, "> $option_tmpdir/$xtrabackup_pid_file";
9+ open XTRABACKUP_PID, ">", "$option_tmpdir/$xtrabackup_pid_file"
10+ or die "Cannot open $option_tmpdir/$xtrabackup_pid_file: $OS_ERROR";
11 print XTRABACKUP_PID $ibbackup_pid;
12 close XTRABACKUP_PID;
13 print STDERR "\n$now $prefix Continuing after ibbackup has suspended\n";
14@@ -4093,8 +4094,8 @@
15 mkdir("$option_tmpdir/$database") ||
16 die "Failed to create directory $option_tmpdir/$database: $!";
17
18- open XTRABACKUP_FH, "> $option_tmpdir/$database/db.opt"
19- || die "Cannot create file $option_tmpdir/db.opt: $!";
20+ open XTRABACKUP_FH, ">", "$option_tmpdir/$database/db.opt"
21+ or die "Cannot create file $option_tmpdir/db.opt: $!";
22 close XTRABACKUP_FH;
23
24 backup_file_via_stream("$option_tmpdir", "$database/db.opt");
25@@ -4828,15 +4829,15 @@
26 my $dst_file = substr($file_name, $filepos + 1);
27 my $dst_path = substr($file_name, 0, $filepos + 1);
28
29- open XTRABACKUP_FH, "> $option_tmpdir/$dst_file"
30- || die "Cannot open file $option_tmpdir/$dst_file: $!\n";
31+ open XTRABACKUP_FH, ">", "$option_tmpdir/$dst_file"
32+ or die "Cannot open file $option_tmpdir/$dst_file: $!\n";
33 print XTRABACKUP_FH $write_data;
34 close XTRABACKUP_FH;
35 backup_file($option_tmpdir, $dst_file, $file_name);
36 unlink "$option_tmpdir/$dst_file";
37 } else {
38- open XTRABACKUP_FH, "> $file_name"
39- || die "Cannot open file $file_name: $!\n";
40+ open XTRABACKUP_FH, ">", "$file_name"
41+ or die "Cannot open file $file_name: $!\n";
42 print XTRABACKUP_FH $write_data;
43 close XTRABACKUP_FH;
44 }

Subscribers

People subscribed via source and target branches

to all changes: