Merge lp:~akopytov/percona-xtrabackup/bug900175-1.6 into lp:percona-xtrabackup/1.6

Proposed by Alexey Kopytov
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 329
Proposed branch: lp:~akopytov/percona-xtrabackup/bug900175-1.6
Merge into: lp:percona-xtrabackup/1.6
Diff against target: 24 lines (+4/-1)
1 file modified
xtrabackup.c (+4/-1)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug900175-1.6
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+92964@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Jenkins revealed a problem with the fix. URL for the new version: http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/114/

Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'xtrabackup.c'
--- xtrabackup.c 2012-01-31 00:19:20 +0000
+++ xtrabackup.c 2012-02-14 12:51:18 +0000
@@ -779,6 +779,8 @@
779fil_node_t *779fil_node_t *
780datafiles_iter_next(datafiles_iter_t *it, ibool *space_changed)780datafiles_iter_next(datafiles_iter_t *it, ibool *space_changed)
781{781{
782 fil_node_t *new_node;
783
782 os_mutex_enter(it->mutex);784 os_mutex_enter(it->mutex);
783785
784 *space_changed = FALSE;786 *space_changed = FALSE;
@@ -808,9 +810,10 @@
808 it->node = UT_LIST_GET_FIRST(it->space->chain);810 it->node = UT_LIST_GET_FIRST(it->space->chain);
809811
810end:812end:
813 new_node = it->node;
811 os_mutex_exit(it->mutex);814 os_mutex_exit(it->mutex);
812815
813 return it->node;816 return new_node;
814}817}
815818
816static819static

Subscribers

People subscribed via source and target branches