From 81318f04c8dd935d994d5ade3aed95f0059d5a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Mon, 3 Mar 2014 15:51:54 +0200 Subject: [PATCH] Yet more windows fixes. --- storage/innobase/os/os0file.cc | 4 ++-- storage/xtradb/os/os0file.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 2ca7f2009c6..f0ca05b7faa 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -6246,12 +6246,12 @@ os_file_trim( FALSE, __FILE__, __LINE__); if (slot->write_size) { - slot->write_size = 0; + *slot->write_size = 0; } return (FALSE); } else { if (slot->write_size) { - slot->write_size = len; + *slot->write_size = len; } } #endif diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index c56a625a84c..933690dfefa 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -5188,7 +5188,7 @@ os_aio_windows_handle( break; case OS_FILE_READ: ret_val = os_file_read(slot->file, slot->buf, - slot->control.Offset, slot->control.OffsetHigh, slot->len); + slot->offset, slot->len); break; default: ut_error; @@ -6311,12 +6311,12 @@ os_file_trim( FALSE, __FILE__, __LINE__); if (slot->write_size) { - slot->write_size = 0; + *slot->write_size = 0; } return (FALSE); } else { if (slot->write_size) { - slot->write_size = len; + *slot->write_size = len; } } #endif