From 4e3796d720ab37883af63e8a6252b1a36812b5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 29 Jul 2014 06:10:18 +0300 Subject: [PATCH] Fix compiler error on Windows. --- storage/xtradb/os/os0file.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 10b30621de5..394c3199f76 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -5345,16 +5345,12 @@ os_aio_windows_handle( } #ifdef HAVE_LZO - if (slot->page_compressed && - innodb_compression_algorithm == 3 && - slot->lzo_mem == NULL) { + if (innodb_compression_algorithm == 3 && slot->lzo_mem == NULL) { os_slot_alloc_lzo_mem(slot); } #endif if (slot->type == OS_FILE_READ) { - if (slot->page_compressed) { - fil_decompress_page(slot->page_buf, slot->buf, slot->len, slot->write_size); - } + fil_decompress_page(slot->page_buf, slot->buf, slot->len, slot->write_size); } else { if (slot->page_compress_success && fil_page_is_compressed(slot->page_buf)) { if (srv_use_trim && os_fallocate_failed == FALSE) {