diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 19:44:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-09 08:53:08 +0200 |
| commit | ad0c218a440575fa6fb6634aca7a08448a4360e0 (patch) | |
| tree | b52811847ce51c92eabdeed3104df8b0168943df /storage/xtradb/include/os0file.h | |
| parent | bb4ef470c24cdbcedba3dd3dcda3b3d88b6fb491 (diff) | |
| parent | 9fe92a9770a801c4cd36390620486be4cb06752b (diff) | |
| download | mariadb-git-ad0c218a440575fa6fb6634aca7a08448a4360e0.tar.gz | |
Merge 10.0 into 10.1
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:
recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).
Report progress also via systemd using sd_notifyf().
Diffstat (limited to 'storage/xtradb/include/os0file.h')
| -rw-r--r-- | storage/xtradb/include/os0file.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/include/os0file.h b/storage/xtradb/include/os0file.h index f590c5f16ce..d6f0ecfb69c 100644 --- a/storage/xtradb/include/os0file.h +++ b/storage/xtradb/include/os0file.h @@ -557,9 +557,10 @@ os_file_create_simple_no_error_handling_func( value */ __attribute__((nonnull, warn_unused_result)); /****************************************************************//** -Tries to disable OS caching on an opened file descriptor. */ +Tries to disable OS caching on an opened file descriptor. +@return true if operation is success and false otherwise */ UNIV_INTERN -void +bool os_file_set_nocache( /*================*/ os_file_t fd, /*!< in: file descriptor to alter */ |