Merge lp:~akopytov/percona-server/bug1189429-5.6 into lp:percona-server/5.6

Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 382
Merged at revision: 382
Proposed branch: lp:~akopytov/percona-server/bug1189429-5.6
Merge into: lp:percona-server/5.6
Diff against target: 17 lines (+5/-2)
1 file modified
Percona-Server/storage/innobase/os/os0file.cc (+5/-2)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1189429-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+168421@code.launchpad.net

Description of the change

    Bug #1189429: Compiler warnings in os0file.c in non-Linux builds
                  introduced by atomic patch

    Added the unused attributed for os_file_set_atomic_writes() arguments
    to avoid compiler warnings when building on non-Linux platforms.

    Ported to 5.6 as a separate revisions, as the atomic patch in 5.5 is
    after the current GCA revision.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
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-05-31 09:47:43 +0000
3+++ Percona-Server/storage/innobase/os/os0file.cc 2013-06-10 12:01:36 +0000
4@@ -1510,8 +1510,11 @@
5 ibool
6 os_file_set_atomic_writes(
7 /*======================*/
8- const char* name, /*!< in: name of the file */
9- os_file_t file) /*!< in: handle to the file */
10+ const char* name /*!< in: name of the file */
11+ __attribute__((unused)),
12+ os_file_t file /*!< in: handle to the file */
13+ __attribute__((unused)))
14+
15 {
16 #ifdef DFS_IOCTL_ATOMIC_WRITE_SET
17 int atomic_option = 1;

Subscribers

People subscribed via source and target branches