diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 11:08:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 11:08:23 +0200 |
| commit | a65162a396b1c298687992dd62ece924978b4c29 (patch) | |
| tree | 5ddf600a95c8520cee29146df924f442068f266c /storage/innobase/include/os0file.h | |
| parent | 909f7607018e644754a2c41b791b44b25a05e8fb (diff) | |
| parent | 139ba26dbacc37858d7746b8ef53a7330f9a8fcc (diff) | |
| download | mariadb-git-a65162a396b1c298687992dd62ece924978b4c29.tar.gz | |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/include/os0file.h')
| -rw-r--r-- | storage/innobase/include/os0file.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index e9fec827c1f..5077c9e37eb 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -1,6 +1,6 @@ /*********************************************************************** -Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. Portions of this file contain modifications contributed and copyrighted @@ -384,10 +384,10 @@ to original un-instrumented file I/O APIs */ enum os_file_type_t { OS_FILE_TYPE_UNKNOWN = 0, - OS_FILE_TYPE_FILE, /* regular file */ + OS_FILE_TYPE_FILE, /* regular file + (or a character/block device) */ OS_FILE_TYPE_DIR, /* directory */ - OS_FILE_TYPE_LINK, /* symbolic link */ - OS_FILE_TYPE_BLOCK /* block device */ + OS_FILE_TYPE_LINK /* symbolic link */ }; /* Maximum path string length in bytes when referring to tables with in the |