diff options
Diffstat (limited to 'storage/innobase/os/os0file.cc')
| -rw-r--r-- | storage/innobase/os/os0file.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 3c422a32879..36ee1401ee1 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -866,8 +866,10 @@ os_file_get_block_size( 0, OPEN_EXISTING, 0, 0); if (volume_handle == INVALID_HANDLE_VALUE) { - os_file_handle_error_no_exit(volume, - "CreateFile()", FALSE); + if (GetLastError() != ERROR_ACCESS_DENIED) { + os_file_handle_error_no_exit(volume, + "CreateFile()", FALSE); + } goto end; } @@ -889,16 +891,7 @@ os_file_get_block_size( if (!result) { DWORD err = GetLastError(); - if (err == ERROR_INVALID_FUNCTION || err == ERROR_NOT_SUPPORTED) { - // Don't report error, it is driver's fault, not ours or users. - // We handle this with fallback. Report wit info message, just once. - static bool write_info = true; - if (write_info) { - ib::info() << "DeviceIoControl(IOCTL_STORAGE_QUERY_PROPERTY)" - << " unsupported on volume " << volume; - write_info = false; - } - } else { + if (err != ERROR_INVALID_FUNCTION && err != ERROR_NOT_SUPPORTED) { os_file_handle_error_no_exit(volume, "DeviceIoControl(IOCTL_STORAGE_QUERY_PROPERTY)", FALSE); } |