From 4e9083853de55d1577bd94d18775d0a916fecf99 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 31 May 2012 11:47:13 +0200 Subject: [PATCH] Bug 14116252 - CANNOT BUILD ARCHIVE ENGINE WHEN WITH_PERFSCHEMA_STORAGE_ENGINE=0 Fixed a build break with compiling without the performance schema, instrumentation should be protected by HAVE_PSI_INTERFACE --- storage/archive/azio.c | 2 ++ storage/archive/ha_archive.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/storage/archive/azio.c b/storage/archive/azio.c index ec4b5bcb7cd..15b3434ab32 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -37,7 +37,9 @@ void putLong(File file, uLong x); uLong getLong(azio_stream *s); void read_header(azio_stream *s, unsigned char *buffer); +#ifdef HAVE_PSI_INTERFACE extern PSI_file_key arch_key_file_data; +#endif /* =========================================================================== Opens a gzip (.gz) file for reading or writing. The mode parameter diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index dba647b8d1a..24dbaefce27 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -114,7 +114,9 @@ static HASH archive_open_tables; #define DATA_BUFFER_SIZE 2 // Size of the data used in the data file #define ARCHIVE_CHECK_HEADER 254 // The number we use to determine corruption +#ifdef HAVE_PSI_INTERFACE extern "C" PSI_file_key arch_key_file_data; +#endif /* Static declarations for handerton */ static handler *archive_create_handler(handlerton *hton,