← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to storage/innobase/os/os0file.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-07-21 07:09:29 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20150721070929-mg4dpqkgg3it1ajf
Tags: upstream-5.6.25
Import upstream version 5.6.25

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/os/os0file.cc
1
1
/***********************************************************************
2
2
 
3
 
Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 
3
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
4
4
Copyright (c) 2009, Percona Inc.
5
5
 
6
6
Portions of this file contain modifications contributed and copyrighted
3187
3187
                stat_info->type = OS_FILE_TYPE_LINK;
3188
3188
                break;
3189
3189
        case S_IFBLK:
3190
 
                stat_info->type = OS_FILE_TYPE_BLOCK;
3191
 
                break;
 
3190
                /* Handle block device as regular file. */
 
3191
        case S_IFCHR:
 
3192
                /* Handle character device as regular file. */
3192
3193
        case S_IFREG:
3193
3194
                stat_info->type = OS_FILE_TYPE_FILE;
3194
3195
                break;
3197
3198
        }
3198
3199
 
3199
3200
 
3200
 
        if (check_rw_perm && (stat_info->type == OS_FILE_TYPE_FILE
3201
 
                              || stat_info->type == OS_FILE_TYPE_BLOCK)) {
 
3201
        if (check_rw_perm && stat_info->type == OS_FILE_TYPE_FILE) {
 
3202
 
3202
3203
                int     fh;
3203
3204
                int     access;
3204
3205