diff options
Diffstat (limited to 'storage/xtradb/buf/buf0flu.cc')
| -rw-r--r-- | storage/xtradb/buf/buf0flu.cc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/storage/xtradb/buf/buf0flu.cc b/storage/xtradb/buf/buf0flu.cc index 278f47fc327..c0686cf844f 100644 --- a/storage/xtradb/buf/buf0flu.cc +++ b/storage/xtradb/buf/buf0flu.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -931,12 +931,12 @@ buf_flush_write_block_low( break; case BUF_BLOCK_ZIP_DIRTY: frame = bpage->zip.data; - mach_write_to_8(frame + FIL_PAGE_LSN, bpage->newest_modification); - memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8); ut_a(page_zip_verify_checksum(frame, zip_size)); + + memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8); break; case BUF_BLOCK_FILE_PAGE: frame = bpage->zip.data; @@ -2847,8 +2847,6 @@ DECLARE_THREAD(buf_flush_lru_manager_thread)( while (srv_shutdown_state == SRV_SHUTDOWN_NONE || srv_shutdown_state == SRV_SHUTDOWN_CLEANUP) { - ulint n_flushed_lru; - srv_current_thread_priority = srv_cleaner_thread_priority; page_cleaner_sleep_if_needed(next_loop_time); @@ -2857,16 +2855,7 @@ DECLARE_THREAD(buf_flush_lru_manager_thread)( next_loop_time = ut_time_ms() + lru_sleep_time; - n_flushed_lru = buf_flush_LRU_tail(); - - if (n_flushed_lru) { - - MONITOR_INC_VALUE_CUMULATIVE( - MONITOR_FLUSH_BACKGROUND_TOTAL_PAGE, - MONITOR_FLUSH_BACKGROUND_COUNT, - MONITOR_FLUSH_BACKGROUND_PAGES, - n_flushed_lru); - } + buf_flush_LRU_tail(); } buf_lru_manager_is_active = false; |