Merge lp:~akopytov/percona-xtrabackup/bug811065 into lp:percona-xtrabackup/2.0

Proposed by Alexey Kopytov
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 291
Proposed branch: lp:~akopytov/percona-xtrabackup/bug811065
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 26 lines (+3/-0)
1 file modified
xtrabackup.c (+3/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug811065
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+68100@code.launchpad.net

Description of the change

Can't link a Jenkins build because the previous one got stuck due to the very same bug.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'xtrabackup.c'
2--- xtrabackup.c 2011-07-05 06:22:41 +0000
3+++ xtrabackup.c 2011-07-15 15:01:29 +0000
4@@ -3383,6 +3383,7 @@
5 return(FALSE);
6
7 error:
8+ mutex_exit(&log_sys->mutex);
9 if (!xtrabackup_stream)
10 os_file_close(dst_log);
11 fprintf(stderr, "xtrabackup: Error: xtrabackup_copy_logfile() failed.\n");
12@@ -3938,6 +3939,7 @@
13 MACH_READ_64(buf + LOG_CHECKPOINT_NO)) != 0) {
14 checkpoint_lsn_start = MACH_READ_64(buf + LOG_CHECKPOINT_LSN);
15 checkpoint_no_start = MACH_READ_64(buf + LOG_CHECKPOINT_NO);
16+ mutex_exit(&log_sys->mutex);
17 goto reread_log_header;
18 }
19
20@@ -4126,6 +4128,7 @@
21
22 if (err != DB_SUCCESS) {
23 fprintf(stderr, "xtrabackup: Error: recv_find_max_checkpoint() failed.\n");
24+ mutex_exit(&log_sys->mutex);
25 goto skip_last_cp;
26 }
27

Subscribers

People subscribed via source and target branches