diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 16:23:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 16:23:02 +0100 |
| commit | 359ae59ac0bc1a4fccd35347a20c56d5f5e8c513 (patch) | |
| tree | 62a28c7f5d5284e6f74722831025b0f65b189be3 /storage/xtradb/include/os0file.h | |
| parent | 5b3c10078848260414663f542a007c36e2b7aae7 (diff) | |
| parent | 1e270d504d56cb015efe060b319e3a5b9bc6513f (diff) | |
| download | mariadb-git-359ae59ac0bc1a4fccd35347a20c56d5f5e8c513.tar.gz | |
Merge branch 'merge/merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/include/os0file.h')
| -rw-r--r-- | storage/xtradb/include/os0file.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/storage/xtradb/include/os0file.h b/storage/xtradb/include/os0file.h index 24f4d2b78aa..a1c0cab37d4 100644 --- a/storage/xtradb/include/os0file.h +++ b/storage/xtradb/include/os0file.h @@ -132,6 +132,10 @@ enum os_file_create_t { #define OS_FILE_READ_ONLY 333 #define OS_FILE_READ_WRITE 444 #define OS_FILE_READ_ALLOW_DELETE 555 /* for mysqlbackup */ +#define OS_FILE_READ_WRITE_CACHED 666 /* OS_FILE_READ_WRITE but never + O_DIRECT. Only for + os_file_create_simple_no_error_handling + currently. */ /* Options for file_create */ #define OS_FILE_AIO 61 @@ -541,9 +545,11 @@ os_file_create_simple_no_error_handling_func( null-terminated string */ ulint create_mode,/*!< in: create mode */ ulint access_type,/*!< in: OS_FILE_READ_ONLY, - OS_FILE_READ_WRITE, or - OS_FILE_READ_ALLOW_DELETE; the last option is - used by a backup program reading the file */ + OS_FILE_READ_WRITE, + OS_FILE_READ_ALLOW_DELETE (used by a backup + program reading the file), or + OS_FILE_READ_WRITE_CACHED (disable O_DIRECT + if it would be enabled otherwise) */ ibool* success)/*!< out: TRUE if succeed, FALSE if error */ __attribute__((nonnull, warn_unused_result)); /****************************************************************//** |