diff options
author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 12:30:06 -0200 |
---|---|---|
committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 12:30:06 -0200 |
commit | 15d104591f5d404f307254bd253b73d33447f148 (patch) | |
tree | 67d1a3dc3909318f32e8ede4989ed6f9a9190208 /storage/innobase/os | |
parent | acaede733412e58e01760ef9d03d66441c0fd4ba (diff) | |
parent | 162dd50668acfed258b2650fec8dab519a11713f (diff) | |
download | mariadb-git-15d104591f5d404f307254bd253b73d33447f148.tar.gz |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'storage/innobase/os')
-rw-r--r-- | storage/innobase/os/os0file.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c index 6c17ded0073..3d1577fe3ca 100644 --- a/storage/innobase/os/os0file.c +++ b/storage/innobase/os/os0file.c @@ -1295,10 +1295,12 @@ UNIV_INTERN void os_file_set_nocache( /*================*/ - int fd, /*!< in: file descriptor to alter */ - const char* file_name, /*!< in: file name, used in the - diagnostic message */ - const char* operation_name) /*!< in: "open" or "create"; used in the + int fd /*!< in: file descriptor to alter */ + __attribute__((unused)), + const char* file_name /*!< in: used in the diagnostic message */ + __attribute__((unused)), + const char* operation_name __attribute__((unused))) + /*!< in: "open" or "create"; used in the diagnostic message */ { /* some versions of Solaris may not have DIRECTIO_ON */ |