diff options
| -rw-r--r-- | storage/innobase/include/os0file.h | 2 | ||||
| -rw-r--r-- | storage/innobase/os/os0file.cc | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index e9d8fb21bf5..7e190b340de 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -263,7 +263,7 @@ struct os_file_size_t { constexpr ulint OS_AIO_N_PENDING_IOS_PER_THREAD= 256; extern Atomic_counter<ulint> os_n_file_reads; -extern ulint os_n_file_writes; +extern Atomic_counter<size_t> os_n_file_writes; extern Atomic_counter<size_t> os_n_fsyncs; /* File types for directory entry data type */ diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index e9c26c4c04d..3a1b0475a7a 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -157,7 +157,7 @@ static ulint os_innodb_umask = 0; Atomic_counter<ulint> os_n_file_reads; static ulint os_bytes_read_since_printout; -ulint os_n_file_writes; +Atomic_counter<size_t> os_n_file_writes; Atomic_counter<size_t> os_n_fsyncs; static ulint os_n_file_reads_old; static ulint os_n_file_writes_old; @@ -3924,12 +3924,11 @@ os_aio_print(FILE* file) fprintf(file, "Pending flushes (fsync) log: " ULINTPF "; buffer pool: " ULINTPF "\n" - ULINTPF " OS file reads, " - ULINTPF " OS file writes, %zu OS fsyncs\n", + ULINTPF " OS file reads, %zu OS file writes, %zu OS fsyncs\n", log_sys.get_pending_flushes(), ulint{fil_n_pending_tablespace_flushes}, ulint{os_n_file_reads}, - os_n_file_writes, + static_cast<size_t>(os_n_file_writes), static_cast<size_t>(os_n_fsyncs)); const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS)); |