1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 14116252 - CANNOT BUILD ARCHIVE ENGINE WHEN WITH_PERFSCHEMA_STORAGE_ENGINE=0

Browse Source 
Fixed a build break with compiling without the performance schema,
instrumentation should be protected by HAVE_PSI_INTERFACE
This commit is contained in:
Marc Alff 2012-05-31 11:47:13 +02:00
parent bab2584389
commit 4e9083853d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/archive/azio.c
View File

@ -37,7 +37,9 @@ void putLong(File file, uLong x);
uLong getLong(azio_stream *s); uLong getLong(azio_stream *s);
void read_header(azio_stream *s, unsigned char *buffer); void read_header(azio_stream *s, unsigned char *buffer);
#ifdef HAVE_PSI_INTERFACE
extern PSI_file_key arch_key_file_data; extern PSI_file_key arch_key_file_data;
#endif
/* =========================================================================== /* ===========================================================================
Opens a gzip (.gz) file for reading or writing. The mode parameter Opens a gzip (.gz) file for reading or writing. The mode parameter

2
storage/archive/ha_archive.cc
View File

@ -114,7 +114,9 @@ static HASH archive_open_tables;
#define DATA_BUFFER_SIZE 2 // Size of the data used in the data file #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 #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; extern "C" PSI_file_key arch_key_file_data;
#endif
/* Static declarations for handerton */ /* Static declarations for handerton */
static handler *archive_create_handler(handlerton *hton, static handler *archive_create_handler(handlerton *hton,