From: Marc Alff
Date: May 29 2012 10:24am
Subject: bzr push into mysql-trunk branch (marc.alff:3905)
List-Archive: http://lists.mysql.com/commits/143993
Message-Id: <201205291024.q4TAOlG0013762@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3905 Marc Alff	2012-05-29 [merge]
      Local merge

    added:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
    modified:
      sql/share/errmsg-utf8.txt
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
=== modified file '.bzrignore'
--- a/.bzrignore	2012-03-19 11:14:55 +0000
+++ b/.bzrignore	2012-05-29 10:09:25 +0000
@@ -3134,3 +3134,4 @@ client/mysql_plugin
 support-files/plugins.files
 storage/perfschema/pfs_lex_token.h
 storage/perfschema/gen_pfs_lex_token
+sql/share/bulgarian

=== modified file 'storage/archive/azio.c'
--- a/storage/archive/azio.c	2012-05-25 11:14:08 +0000
+++ b/storage/archive/azio.c	2012-05-29 10:09:25 +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-25 11:14:08 +0000
+++ b/storage/archive/ha_archive.cc	2012-05-29 10:09:25 +0000
@@ -119,7 +119,9 @@
 #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).