diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 14:25:36 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 14:25:36 +0300 |
commit | e5c4f4e590d7782ef938b436f84ae11b68e0af08 (patch) | |
tree | 7919303321a6e4663340a75dd56aa4ef55e3ef4f /storage/innobase/include/os0file.h | |
parent | 3bb36e949534fc4a24d68d4297663ae8b80ba336 (diff) | |
parent | 0ee1082bd2e7e7049c4f0e686bad53cf7ba053ab (diff) | |
download | mariadb-git-e5c4f4e590d7782ef938b436f84ae11b68e0af08.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/os0file.h')
-rw-r--r-- | storage/innobase/include/os0file.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index b301fcf5dfa..646f964df7f 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2021, MariaDB Corporation. +Copyright (c) 2013, 2022, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -582,6 +582,14 @@ os_file_set_nocache( const char* operation_name); #endif +#ifndef _WIN32 /* On Microsoft Windows, mandatory locking is used */ +/** Obtain an exclusive lock on a file. +@param fd file descriptor +@param name file name +@return 0 on success */ +int os_file_lock(int fd, const char *name); +#endif + /** NOTE! Use the corresponding macro os_file_create(), not directly this function! Opens an existing file or creates a new. |