fix compilation w/o perfschema

followup for 3a3605f
MariaDB · Jan 16, 2020 · e7558d4 · e7558d4
1 parent fc5a6a2
commit e7558d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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