mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2020-12-23 15:07:36 +02:00
commit b6be78d4e5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/include/os0file.h
View file

@ -38,6 +38,7 @@ Created 10/21/1995 Heikki Tuuri
#include "fsp0types.h"
#include "tpool.h"
#include "my_counter.h"
#ifndef _WIN32
#include <dirent.h>
@ -266,7 +267,7 @@ struct os_file_size_t {
constexpr ulint OS_AIO_N_PENDING_IOS_PER_THREAD= 256;
extern ulint os_n_file_reads;
extern Atomic_counter<ulint> os_n_file_reads;
extern ulint os_n_file_writes;
extern ulint os_n_fsyncs;

4
storage/innobase/os/os0file.cc
View file

@ -161,7 +161,7 @@ static ulint os_innodb_umask = 0;
#endif /* WITH_INNODB_DISALLOW_WRITES */
ulint os_n_file_reads;
Atomic_counter<ulint> os_n_file_reads;
static ulint os_bytes_read_since_printout;
ulint os_n_file_writes;
ulint os_n_fsyncs;
@ -4184,7 +4184,7 @@ os_aio_print(FILE* file)
ULINTPF " OS fsyncs\n",
log_sys.get_pending_flushes(),
ulint{fil_n_pending_tablespace_flushes},
os_n_file_reads,
ulint{os_n_file_reads},
os_n_file_writes,
os_n_fsyncs);