Merge lp:~laurynas-biveinis/percona-server/bug1255638 into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 505
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1255638
Merge into: lp:percona-server/5.6
Diff against target: 12 lines (+1/-1)
1 file modified
Percona-Server/storage/innobase/os/os0file.cc (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1255638
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Registry Administrators Pending
Review via email: mp+197037@code.launchpad.net

Description of the change

Fix bug 1255638 (Operating system errors if innobase_atomic_writes are
used on separate undo files that do not exists).

Fix provided by Jan Lindström.

The issue is os_file_create_func() calling os_file_set_atomic_writes()
even when os_file_create_func() has encountered an error and is about
to return an invalid file descriptor. Fix by calling
os_file_set_atomic_writes() only on valid file descriptors.

http://jenkins.percona.com/job/percona-server-5.6-param/420/

To post a comment you must log in.
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
1=== modified file 'Percona-Server/storage/innobase/os/os0file.cc'
2--- Percona-Server/storage/innobase/os/os0file.cc 2013-10-15 11:37:57 +0000
3+++ Percona-Server/storage/innobase/os/os0file.cc 2013-11-28 10:50:44 +0000
4@@ -1825,7 +1825,7 @@
5 #endif /* USE_FILE_LOCK */
6
7 if (srv_use_atomic_writes && type == OS_DATA_FILE
8- && !os_file_set_atomic_writes(name, file)) {
9+ && file != -1 && !os_file_set_atomic_writes(name, file)) {
10
11 *success = FALSE;
12 close(file);

Subscribers

People subscribed via source and target branches