diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
| commit | 91acc8b16fdd8409765f32b5453851366552a709 (patch) | |
| tree | 18c04064e9fc127c5e477ec08613aae7baaab2ae /storage/xtradb/os | |
| parent | 4c69dc8116950d6bf0b09bfbc31a86d89831a364 (diff) | |
| parent | 0403790722e3941779ccea26e85fcd818e2320b5 (diff) | |
| download | mariadb-git-91acc8b16fdd8409765f32b5453851366552a709.tar.gz | |
Merge tag 'mariadb-10.0.21' into 10.0-galera
Diffstat (limited to 'storage/xtradb/os')
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index efd2179a37b..855c500a1bb 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -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 @@ -3412,8 +3412,9 @@ os_file_get_status( stat_info->type = OS_FILE_TYPE_LINK; break; case S_IFBLK: - stat_info->type = OS_FILE_TYPE_BLOCK; - break; + /* Handle block device as regular file. */ + case S_IFCHR: + /* Handle character device as regular file. */ case S_IFREG: stat_info->type = OS_FILE_TYPE_FILE; break; @@ -3422,8 +3423,8 @@ os_file_get_status( } - if (check_rw_perm && (stat_info->type == OS_FILE_TYPE_FILE - || stat_info->type == OS_FILE_TYPE_BLOCK)) { + if (check_rw_perm && stat_info->type == OS_FILE_TYPE_FILE) { + int fh; int access; |