fix typo, amend last commit

vaintroub · vaintroub · commit 47ea2227e564 · 2018-04-14T23:59:59.000+01:00
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -890,7 +890,7 @@ os_file_get_block_size(
 
 	if (!result) {
 		DWORD err = GetLastError();
-		if (err != ERROR_INVALID_FUNCTION || err != ERROR_NOT_SUPPORTED) {
+		if (err != ERROR_INVALID_FUNCTION && err != ERROR_NOT_SUPPORTED) {
 				os_file_handle_error_no_exit(volume,
 					"DeviceIoControl(IOCTL_STORAGE_QUERY_PROPERTY)", FALSE);
 		}

Original file line number	Diff line number	Diff line change
`@@ -890,7 +890,7 @@ os_file_get_block_size(`
`890`	`890`
`891`	`891`	`if (!result) {`
`892`	`892`	`DWORD err = GetLastError();`
`893`		`- if (err != ERROR_INVALID_FUNCTION \|\| err != ERROR_NOT_SUPPORTED) {`
	`893`	`+ if (err != ERROR_INVALID_FUNCTION && err != ERROR_NOT_SUPPORTED) {`
`894`	`894`	`os_file_handle_error_no_exit(volume,`
`895`	`895`	`"DeviceIoControl(IOCTL_STORAGE_QUERY_PROPERTY)", FALSE);`
`896`	`896`	`}`