Skip to content

M
mariadb
Commit 81318f04 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Yet more windows fixes.

parent e656a8a9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
storage/innobase/os/os0file.cc
View file @ 81318f04
...@@ -6246,12 +6246,12 @@ os_file_trim( ...@@ -6246,12 +6246,12 @@ os_file_trim(
FALSE, __FILE__, __LINE__); FALSE, __FILE__, __LINE__);
if (slot->write_size) { if (slot->write_size) {
slot->write_size = 0; *slot->write_size = 0;
} }
return (FALSE); return (FALSE);
} else { } else {
if (slot->write_size) { if (slot->write_size) {
slot->write_size = len; *slot->write_size = len;
} }
} }
#endif #endif
......
storage/xtradb/os/os0file.cc
View file @ 81318f04
...@@ -5188,7 +5188,7 @@ os_aio_windows_handle( ...@@ -5188,7 +5188,7 @@ os_aio_windows_handle(
break; break;
case OS_FILE_READ: case OS_FILE_READ:
ret_val = os_file_read(slot->file, slot->buf, ret_val = os_file_read(slot->file, slot->buf,
slot->control.Offset, slot->control.OffsetHigh, slot->len); slot->offset, slot->len);
break; break;
default: default:
ut_error; ut_error;
...@@ -6311,12 +6311,12 @@ os_file_trim( ...@@ -6311,12 +6311,12 @@ os_file_trim(
FALSE, __FILE__, __LINE__); FALSE, __FILE__, __LINE__);
if (slot->write_size) { if (slot->write_size) {
slot->write_size = 0; *slot->write_size = 0;
} }
return (FALSE); return (FALSE);
} else { } else {
if (slot->write_size) { if (slot->write_size) {
slot->write_size = len; *slot->write_size = len;
} }
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7