From ee5633a39e5f82546f720b4c487fec6bf5f5c066 Mon Sep 17 00:00:00 2001 From: josh4trunks Date: Sun, 12 Jul 2015 19:46:29 -0700 Subject: Apply fix for raw devices to XtraDB --- storage/xtradb/os/os0file.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'storage/xtradb/os') diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 978f3dc7cc4..41cbe3f119f 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 @@ -3388,8 +3388,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; @@ -3398,8 +3399,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; -- cgit v1.2.1