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

Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 536
Proposed branch: lp:~akopytov/percona-server/bug1189429-5.5
Merge into: lp:percona-server/5.5
Diff against target: 17 lines (+5/-2)
1 file modified
Percona-Server/storage/innobase/os/os0file.c (+5/-2)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1189429-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+168420@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.

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
=== modified file 'Percona-Server/storage/innobase/os/os0file.c'
--- Percona-Server/storage/innobase/os/os0file.c 2013-06-01 15:04:43 +0000
+++ Percona-Server/storage/innobase/os/os0file.c 2013-06-10 12:00:39 +0000
@@ -1381,8 +1381,11 @@
1381ibool1381ibool
1382os_file_set_atomic_writes(1382os_file_set_atomic_writes(
1383/*======================*/1383/*======================*/
1384 const char* name, /*!< in: name of the file */1384 const char* name /*!< in: name of the file */
1385 os_file_t file) /*!< in: handle to the file */1385 __attribute__((unused)),
1386 os_file_t file /*!< in: handle to the file */
1387 __attribute__((unused)))
1388
1386{1389{
1387#ifdef DFS_IOCTL_ATOMIC_WRITE_SET1390#ifdef DFS_IOCTL_ATOMIC_WRITE_SET
1388 int atomic_option = 1;1391 int atomic_option = 1;

Subscribers

People subscribed via source and target branches