From e7558d4760d20f7b5480ee2eb3ab7d710d1784b1 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 16 Jan 2020 18:04:43 +0100 Subject: [PATCH] fix compilation w/o perfschema followup for 3a3605f4b1a --- storage/innobase/include/os0file.h | 3 +-- storage/innobase/os/os0file.cc | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index 12f21c80470..c22dddffe92 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -1124,8 +1124,7 @@ to original un-instrumented file I/O APIs */ # define os_file_flush(file) os_file_flush_func(file) -#define os_file_flush_data(file) \ - pfs_os_file_flush_data_func(file, __FILE__, __LINE__) +#define os_file_flush_data(file) os_file_flush_data_func(file) # define os_file_rename(key, oldpath, newpath) \ os_file_rename_func(oldpath, newpath) diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index eda130cbed0..332c311c374 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -4631,6 +4631,7 @@ bool os_file_flush_data_func(os_file_t file) { #endif } +#ifdef UNIV_PFS_IO bool pfs_os_file_flush_data_func(pfs_os_file_t file, const char *src_file, uint src_line) { @@ -4645,3 +4646,4 @@ bool pfs_os_file_flush_data_func(pfs_os_file_t file, const char *src_file, register_pfs_file_io_end(locker, 0); return success; } +#endif