bzr push into mysql-5.5 branch (marc.alff:3857)

[Marc Alff]

 3857 Marc Alff	2012-05-31 [merge]
      Local merge

=== modified file 'storage/archive/azio.c'
--- a/storage/archive/azio.c	2012-05-24 17:30:32 +0000
+++ b/storage/archive/azio.c	2012-05-31 09:47:13 +0000
@@ -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

=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2012-05-24 17:30:32 +0000
+++ b/storage/archive/ha_archive.cc	2012-05-31 09:47:13 +0000
@@ -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, 

No bundle (reason: useless for push emails).